[linux-next] LinuxNextTracking branch, master, updated. next-20161111

batman at open-mesh.org batman at open-mesh.org
Sat Nov 12 00:15:43 CET 2016


The following commit has been merged in the master branch:
commit eb6915e2eb254fd83dc4472e22ebd6c54bf8ba47
Author: Linus Lüssing <linus.luessing at c0d3.blue>
Date:   Sun Aug 7 12:34:18 2016 +0200

    batman-adv: Remove unused skb_reset_mac_header()
    
    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.
    
    Signed-off-by: Linus Lüssing <linus.luessing at c0d3.blue>
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
    Signed-off-by: Simon Wunderlich <sw at simonwunderlich.de>

diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c
index e1e9136..be3f6d7 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,

-- 
LinuxNextTracking


More information about the linux-merge mailing list