mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Yeking@Red54.com
To: netdev@vger.kernel.org
Cc: "谢致邦 (XIE Zhibang)" <Yeking@Red54.com>,
	"David S. Miller" <davem@davemloft.net>,
	"Eric Dumazet" <edumazet@google.com>,
	"Jakub Kicinski" <kuba@kernel.org>,
	"Paolo Abeni" <pabeni@redhat.com>,
	"Simon Horman" <horms@kernel.org>,
	"Arnd Bergmann" <arnd@arndb.de>,
	"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
	"Vitaly Kuznetsov" <vkuznets@redhat.com>,
	"Prarit Bhargava" <prarit@redhat.com>,
	linux-kernel@vger.kernel.org
Subject: [net PATCH] net: appletalk: Drop aarp_send_probe_phase1()
Date: Thu,  9 Jan 2025 12:27:51 +0000	[thread overview]
Message-ID: <tencent_50197BA0ACE5FECA9F15DB877ED002416809@qq.com> (raw)

From: 谢致邦 (XIE Zhibang) <Yeking@Red54.com>

Due to the ltpc, cops, and ipddp drivers have been deleted,
aarp_send_probe_phase1() no longer works. (found by code inspection)

Fixes: 1dab47139e61 ("appletalk: remove ipddp driver")
Fixes: 00f3696f7555 ("net: appletalk: remove cops support")
Fixes: 03dcb90dbf62 ("net: appletalk: remove Apple/Farallon LocalTalk PC support")
Fixes: dbecb011eb78 ("appletalk: use ndo_siocdevprivate")
Signed-off-by: 谢致邦 (XIE Zhibang) <Yeking@Red54.com>
---
 net/appletalk/aarp.c | 32 ++------------------------------
 1 file changed, 2 insertions(+), 30 deletions(-)

diff --git a/net/appletalk/aarp.c b/net/appletalk/aarp.c
index 9fa0b246902b..af6a737e4dd3 100644
--- a/net/appletalk/aarp.c
+++ b/net/appletalk/aarp.c
@@ -432,38 +432,10 @@ static struct atalk_addr *__aarp_proxy_find(struct net_device *dev,
 	return a ? sa : NULL;
 }
 
-/*
- * Probe a Phase 1 device or a device that requires its Net:Node to
- * be set via an ioctl.
- */
-static void aarp_send_probe_phase1(struct atalk_iface *iface)
-{
-	struct ifreq atreq;
-	struct sockaddr_at *sa = (struct sockaddr_at *)&atreq.ifr_addr;
-	const struct net_device_ops *ops = iface->dev->netdev_ops;
-
-	sa->sat_addr.s_node = iface->address.s_node;
-	sa->sat_addr.s_net = ntohs(iface->address.s_net);
-
-	/* We pass the Net:Node to the drivers/cards by a Device ioctl. */
-	if (!(ops->ndo_do_ioctl(iface->dev, &atreq, SIOCSIFADDR))) {
-		ops->ndo_do_ioctl(iface->dev, &atreq, SIOCGIFADDR);
-		if (iface->address.s_net != htons(sa->sat_addr.s_net) ||
-		    iface->address.s_node != sa->sat_addr.s_node)
-			iface->status |= ATIF_PROBE_FAIL;
-
-		iface->address.s_net  = htons(sa->sat_addr.s_net);
-		iface->address.s_node = sa->sat_addr.s_node;
-	}
-}
-
-
 void aarp_probe_network(struct atalk_iface *atif)
 {
-	if (atif->dev->type == ARPHRD_LOCALTLK ||
-	    atif->dev->type == ARPHRD_PPP)
-		aarp_send_probe_phase1(atif);
-	else {
+	if (atif->dev->type != ARPHRD_LOCALTLK &&
+	    atif->dev->type != ARPHRD_PPP) {
 		unsigned int count;
 
 		for (count = 0; count < AARP_RETRANSMIT_LIMIT; count++) {
-- 
2.43.0


             reply	other threads:[~2025-01-09 12:29 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-01-09 12:27 Yeking [this message]
2025-01-11  2:24 ` Jakub Kicinski
2025-01-13  9:44   ` [PATCH net v2] " Yeking
2025-01-15 22:06     ` Jakub Kicinski
2025-01-17  1:41       ` [PATCH net-next v3] " Yeking
2025-01-20 10:10         ` patchwork-bot+netdevbpf

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tencent_50197BA0ACE5FECA9F15DB877ED002416809@qq.com \
    --to=yeking@red54.com \
    --cc=arnd@arndb.de \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=horms@kernel.org \
    --cc=kuba@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=prarit@redhat.com \
    --cc=vkuznets@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome