net: hdlc_x25: Remove unnecessary skb_reset_network_header calls
Subsystems (4)
PATCH v2 1/1 net: hdlc_x25: Remove unnecessary skb_reset_network_header calls
1. In x25_xmit, skb_reset_network_header is not necessary before we call lapb_data_request. The lapb module doesn't need skb->network_header. So there is no need to set skb->network_header before calling lapb_data_request.
2. In x25_data_indication (called by the lapb module after some data have been received), skb_reset_network_header is not necessary before we call netif_rx. After we call netif_rx, the code in net/core/dev.c will call skb_reset_network_header before handing the skb to upper layers (in __netif_receive_skb_core, called by __netif_receive_skb_one_core, called by __netif_receive_skb, called by process_backlog). So we don't need to call skb_reset_network_header by ourselves.
--- drivers/net/wan/hdlc_x25.c | 2 -- 1 file changed, 2 deletions(-)
drivers/net/wan/hdlc_x25.c +0 -2
@@ -77,7 +77,6 @@ static int x25_data_indication(struct net_device *dev, struct sk_buff *skb) }skb_push (skb,1 ); -skb_reset_network_header (skb); ptr = skb->data; *ptr =X25_IFACE_DATA ;
@@ -118,7 +117,6 @@ static netdev_tx_t x25_xmit(struct sk_buff *skb, struct net_device *dev)switch (skb->data[0 ]) {case X25_IFACE_DATA :/* Data to be transmitted */ skb_pull (skb,1 ); -skb_reset_network_header (skb);if ((result =lapb_data_request (dev, skb)) !=LAPB_OK )dev_kfree_skb (skb);return NETDEV_TX_OK ;
Signature · 1 line
2.27.0
From: Xie He <[email protected]>
Date: Tue, 8 Dec 2020 17:40:13 -0800
Quoted 13 lines
1. In
x25_xmit,skb_reset_network_headeris not necessary before we calllapb_data_request. The lapb module doesn't needskb->network_header. So there is no need to setskb->network_headerbefore callinglapb_data_request.2. In
x25_data_indication(called by the lapb module after some data have been received),skb_reset_network_headeris not necessary before we callnetif_rx. After we callnetif_rx, the code innet/core/dev.cwill callskb_reset_network_headerbefore handing the skb to upper layers (in__netif_receive_skb_core, called by__netif_receive_skb_one_core, called by__netif_receive_skb, called byprocess_backlog). So we don't need to callskb_reset_network_headerby ourselves.
Quoted 2 lines
Cc Martin Schiller <[email protected]>Signed-off-by Xie He <[email protected]>
Applied, thanks.