net: appletalk: Drop aarp_send_probe_phase1()
Subsystems (2)
PATCH 1/1 net: appletalk: Drop aarp_send_probe_phase1()
From: 谢致邦 (XIE Zhibang) <[email protected]>
Due to the ltpc, cops, and ipddp drivers have been deleted, aarp_send_probe_phase1() no longer works. (found by code inspection)
--- net/appletalk/aarp.c | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-)
net/appletalk/aarp.c +2 -30
@@ -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++) {
Signature · 1 line
2.43.0
Jakub Kicinski
maintainerQuoted 2 lines · On Thu, 9 Jan 2025 12:27:51 +0000 [email protected] wrote:
Due to the ltpc, cops, and ipddp drivers have been deleted,
aarp_send_probe_phase1()no longer works. (found by code inspection)
Could you explain more? What is your thought process?
Quoted 4 lines
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")
Dead code is not a bug, you can mention the relevant commits in the commit message, but no Fixes tag are appropriate here.
Signature · 1 line
pw-bot: cr
PATCH v2 1/1 net: appletalk: Drop aarp_send_probe_phase1()
From: 谢致邦 (XIE Zhibang) <[email protected]>
aarp_send_probe_phase1() used to work by calling ndo_do_ioctl of appletalk drivers such as ltpc, cops, or ipddp, but these drivers have been removed since the following commits:
commit dbecb011eb78 ("appletalk: use ndo_siocdevprivate") commit 03dcb90dbf62 ("net: appletalk: remove Apple/Farallon LocalTalk PC support")
commit 00f3696f7555 ("net: appletalk: remove cops support") commit 1dab47139e61 ("appletalk: remove ipddp driver")
Thus aarp_send_probe_phase1() no longer works, so drop it. (found by code inspection)
---
V1 -> V2: Update commit message
net/appletalk/aarp.c | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-)
net/appletalk/aarp.c +2 -30
@@ -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++) {
Signature · 1 line
2.43.0
Jakub Kicinski
maintainernet/appletalk/aarp.c static struct atalk_addr *__aarp_proxy_find(struct net_device *dev, · line 439
Quoted 9 lines · On Mon, 13 Jan 2025 09:44:51 +0000 [email protected] wrote:
void
aarp_probe_network(struct atalk_iface *atif){net/appletalk/aarp.c +2
-4-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;
You assert this is our only option, so why leave the if () around at all?
nit: subject prefix should be "PATCH net-next v2"
Signature · 1 line
pw-bot: cr
PATCH v3 1/1 net: appletalk: Drop aarp_send_probe_phase1()
From: 谢致邦 (XIE Zhibang) <[email protected]>
aarp_send_probe_phase1() used to work by calling ndo_do_ioctl of appletalk drivers ltpc or cops, but these two drivers have been removed since the following commits:
commit 03dcb90dbf62 ("net: appletalk: remove Apple/Farallon LocalTalk PC support")
commit 00f3696f7555 ("net: appletalk: remove cops support")
Thus aarp_send_probe_phase1() no longer works, so drop it. (found by code inspection)
---
V2 -> V3: Drop if(), and update commit message
V1 -> V2: Update commit message
net/appletalk/aarp.c | 45 +++++++------------------------------------- 1 file changed, 7 insertions(+), 38 deletions(-)
net/appletalk/aarp.c +7 -38
@@ -432,49 +432,18 @@ 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 { -unsigned int count; +unsigned int count; -for (count =0 ; count <AARP_RETRANSMIT_LIMIT ; count++) { -aarp_send_probe (atif->dev, &atif->address); +for (count =0 ; count <AARP_RETRANSMIT_LIMIT ; count++) { +aarp_send_probe (atif->dev, &atif->address); -/* Defer 1/10th */ -msleep (100 ); +/* Defer 1/10th */ +msleep (100 ); -if (atif->status &ATIF_PROBE_FAIL ) -break ; - } +if (atif->status &ATIF_PROBE_FAIL ) +break ; } }
Signature · 1 line
2.43.0
This patch was applied to netdev/net-next.git (main) by David S. Miller <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by David S. Miller <[email protected]>:
Quoted 10 lines · On Fri, 17 Jan 2025 01:41:40 +0000 you wrote:
From: 谢致邦 (XIE Zhibang) <[email protected]>
aarp_send_probe_phase1()used to work by callingndo_do_ioctlof appletalk drivers ltpc or cops, but these two drivers have been removed since the following commits:
commit03dcb90dbf62("net: appletalk: remove Apple/Farallon LocalTalk PC support")
commit00f3696f7555("net: appletalk: remove cops support")[...]
Here is the summary with links:
- [net-next,v3] net: appletalk: Drop aarp_send_probe_phase1()
https://git.kernel.org/netdev/net-next/c/45bd1c5ba758
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html