net/x25: Remove unused x25_terminate_link()

[PATCH net-next] net/x25: Remove unused x25_terminate_link()

Posted by linux@treblig.org 2 months, 3 weeks ago

From: "Dr. David Alan Gilbert" <linux@treblig.org>

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.

Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
---
 include/net/x25.h |  1 -
 net/x25/x25_dev.c | 22 ----------------------
 2 files changed, 23 deletions(-)

diff --git a/include/net/x25.h b/include/net/x25.h
index 5e833cfc864e..414f3fd99345 100644
--- a/include/net/x25.h
+++ b/include/net/x25.h
@@ -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 *,
diff --git a/net/x25/x25_dev.c b/net/x25/x25_dev.c
index 748d8630ab58..fb8ac1aa5826 100644
--- a/net/x25/x25_dev.c
+++ b/net/x25/x25_dev.c
@@ -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;
-- 
2.50.1

Re: [PATCH net-next] net/x25: Remove unused x25_terminate_link()

Posted by Martin Schiller 2 months, 3 weeks ago

On 2025-07-12 22:57, linux@treblig.org wrote:
> From: "Dr. David Alan Gilbert" <linux@treblig.org>
> 
> 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.
> 
> Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
> ---
>  include/net/x25.h |  1 -
>  net/x25/x25_dev.c | 22 ----------------------
>  2 files changed, 23 deletions(-)
> 
> diff --git a/include/net/x25.h b/include/net/x25.h
> index 5e833cfc864e..414f3fd99345 100644
> --- a/include/net/x25.h
> +++ b/include/net/x25.h
> @@ -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 *,
> diff --git a/net/x25/x25_dev.c b/net/x25/x25_dev.c
> index 748d8630ab58..fb8ac1aa5826 100644
> --- a/net/x25/x25_dev.c
> +++ b/net/x25/x25_dev.c
> @@ -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;

Acked-by: Martin Schiller <ms@dev.tdt.de>