[v5,1/2] batman-adv: Remove unused skb_reset_mac_header()

Message ID 1470566059-3782-1-git-send-email-linus.luessing@c0d3.blue (mailing list archive)
State Accepted, archived
Commit 3d34c0a675b20cf6dd2b8680188f1ebd399c3589
Delegated to: Sven Eckelmann
Headers

Commit Message

Linus Lüssing Aug. 7, 2016, 10:34 a.m. UTC
  During broadcast queueing, the skb_reset_mac_header() sets the skb
to a place invalid for a MAC header, pointing right into the
batman-adv broadcast packet. Luckily, no one seems to actually use
eth_hdr(skb) afterwards until batadv_send_skb_packet() resets the
header to a valid position again.

Therefore removing this unnecessary, weird skb_reset_mac_header()
call.

Reviewed-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
---

Changes in v2-v5:
* none

 net/batman-adv/send.c | 2 --
 1 file changed, 2 deletions(-)
  

Comments

Sven Eckelmann Oct. 18, 2016, 1:39 p.m. UTC | #1
On Sonntag, 7. August 2016 12:34:18 CEST Linus Lüssing wrote:
> During broadcast queueing, the skb_reset_mac_header() sets the skb
> to a place invalid for a MAC header, pointing right into the
> batman-adv broadcast packet. Luckily, no one seems to actually use
> eth_hdr(skb) afterwards until batadv_send_skb_packet() resets the
> header to a valid position again.
> 
> Therefore removing this unnecessary, weird skb_reset_mac_header()
> call.
> 
> Reviewed-by: Sven Eckelmann <sven@narfation.org>
> Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
> ---
> 
> Changes in v2-v5:
> * none
> 
>  net/batman-adv/send.c | 2 --
>  1 file changed, 2 deletions(-)

Applied in 3d34c0a675b20cf6dd2b8680188f1ebd399c3589 [1].

Kind regards,
	Sven

[1] https://git.open-mesh.org/batman-adv.git/commit/3d34c0a675b20cf6dd2b8680188f1ebd399c3589
  

Patch

diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c
index 8d4e1f5..97bdb0c 100644
--- a/net/batman-adv/send.c
+++ b/net/batman-adv/send.c
@@ -586,8 +586,6 @@  int batadv_add_bcast_packet_to_list(struct batadv_priv *bat_priv,
 	bcast_packet = (struct batadv_bcast_packet *)newskb->data;
 	bcast_packet->ttl--;
 
-	skb_reset_mac_header(newskb);
-
 	forw_packet->skb = newskb;
 
 	INIT_DELAYED_WORK(&forw_packet->delayed_work,