Skip to contentSkip to conversation

net/x25: Remove unused x25_terminate_link()

PATCH Applied [email protected] 3 participants 3 messages Jul 12, 2025 – Jul 15, 2025

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net/x25: Remove unused x25_terminate_link()

From: "Dr. David Alan Gilbert" <[email protected]>

x25_terminate_link() has been unused since the last use was removed in 2020 by:
commit 7eed751b3b2a ("net/x25: handle additional netdev events")

Remove it.

---
 include/net/x25.h |  1 -
 net/x25/x25_dev.c | 22 ----------------------
 2 files changed, 23 deletions(-)
include/net/x25.h +0 -1
index 5e833cfc864e..414f3fd99345 100644
@@ -203,7 +203,6 @@ void x25_send_frame(struct sk_buff *, struct x25_neigh *);
 int x25_lapb_receive_frame(struct sk_buff *, struct net_device *,
 			   struct packet_type *, struct net_device *);
 void x25_establish_link(struct x25_neigh *);
-void x25_terminate_link(struct x25_neigh *);
 
 /* x25_facilities.c */
 int x25_parse_facilities(struct sk_buff *, struct x25_facilities *,
net/x25/x25_dev.c +0 -22
index 748d8630ab58..fb8ac1aa5826 100644
@@ -170,28 +170,6 @@ void x25_establish_link(struct x25_neigh *nb)
 	dev_queue_xmit(skb);
 }
 
-void x25_terminate_link(struct x25_neigh *nb)
-{
-	struct sk_buff *skb;
-	unsigned char *ptr;
-
-	if (nb->dev->type != ARPHRD_X25)
-		return;
-
-	skb = alloc_skb(1, GFP_ATOMIC);
-	if (!skb) {
-		pr_err("x25_dev: out of memory\n");
-		return;
-	}
-
-	ptr  = skb_put(skb, 1);
-	*ptr = X25_IFACE_DISCONNECT;
-
-	skb->protocol = htons(ETH_P_X25);
-	skb->dev      = nb->dev;
-	dev_queue_xmit(skb);
-}
-
 void x25_send_frame(struct sk_buff *skb, struct x25_neigh *nb)
 {
 	unsigned char *dptr;
Signature · 1 line
2.50.1
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 50 lines · On 2025-07-12 22:57, [email protected] wrote:

From: "Dr. David Alan Gilbert" <[email protected]>

x25_terminate_link() has been unused since the last use was removed in 2020 by:
commit 7eed751b3b2a ("net/x25: handle additional netdev events")

Remove it.

---
 include/net/x25.h |  1 -
 net/x25/x25_dev.c | 22 ----------------------
 2 files changed, 23 deletions(-)
include/net/x25.h +0 -1
index 5e833cfc864e..414f3fd99345 100644
@@ -203,7 +203,6 @@ void x25_send_frame(struct sk_buff *, struct 
 x25_neigh *);
 int x25_lapb_receive_frame(struct sk_buff *, struct net_device *,
 			   struct packet_type *, struct net_device *);
 void x25_establish_link(struct x25_neigh *);
-void x25_terminate_link(struct x25_neigh *);
 
 /* x25_facilities.c */

int x25_parse_facilities(struct sk_buff *, struct x25_facilities *,

net/x25/x25_dev.c +0 -15
index 748d8630ab58..fb8ac1aa5826 100644
@@ -170,28 +170,6 @@ void x25_establish_link(struct x25_neigh *nb)
 	dev_queue_xmit(skb);
 }
 
-void x25_terminate_link(struct x25_neigh *nb)
-{
-	struct sk_buff *skb;
-	unsigned char *ptr;
-
-	if (nb->dev->type != ARPHRD_X25)
-		return;
-
-	skb = alloc_skb(1, GFP_ATOMIC);
-	if (!skb) {
-		pr_err("x25_dev: out of memory\n");
-		return;
-	}
-
-	ptr  = skb_put(skb, 1);

net/x25/x25_dev.c void x25_establish_link(struct x25_neigh *nb) · line 175

Quoted 10 lines
net/x25/x25_dev.c +0 -7
-	*ptr = X25_IFACE_DISCONNECT;
-
-	skb->protocol = htons(ETH_P_X25);
-	skb->dev      = nb->dev;
-	dev_queue_xmit(skb);
-}
-
 void x25_send_frame(struct sk_buff *skb, struct x25_neigh *nb)
 {
 	unsigned char *dptr;
#2 lore raw
In reply to [email protected]
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:

Hello:

This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:

Quoted 9 lines · On Sat, 12 Jul 2025 21:57:59 +0100 you wrote:

From: "Dr. David Alan Gilbert" <[email protected]>

x25_terminate_link() has been unused since the last use was removed in 2020 by:
commit 7eed751b3b2a ("net/x25: handle additional netdev events")

Remove it.

[...]

Here is the summary with links:
- [net-next] net/x25: Remove unused x25_terminate_link()

    https://git.kernel.org/netdev/net-next/c/08a305b2a5b8

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html