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

batman at open-mesh.org batman at open-mesh.org
Wed Mar 26 00:28:00 CET 2014

The following commit has been merged in the master branch:
commit e88b617d84b53170f0781cc0756019c5b1855890
Author: Linus Lüssing <linus.luessing at web.de>
Date:   Sun Jan 19 22:22:46 2014 +0100

    batman-adv: remove obsolete skb_reset_mac_header() in batadv_bla_tx()
    Our .ndo_start_xmit handler (batadv_interface_tx()) can rely on having
    the skb mac header pointer set correctly since the following commit
    present in kernels >= 3.9:
    "net: reset mac header in dev_start_xmit()" (6d1ccff627)
    Therefore this commit removes the according, now redundant,
    skb_reset_mac_header() call in batadv_bla_tx().
    Signed-off-by: Linus Lüssing <linus.luessing at web.de>
    Signed-off-by: Marek Lindner <mareklindner at neomailbox.ch>
    Signed-off-by: Antonio Quartulli <antonio at meshcoding.com>

diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c
index 73d8372..70d781a 100644
--- a/net/batman-adv/bridge_loop_avoidance.c
+++ b/net/batman-adv/bridge_loop_avoidance.c
@@ -1547,9 +1547,6 @@ int batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb,
 	if (!atomic_read(&bat_priv->bridge_loop_avoidance))
 		goto allow;
-	/* in VLAN case, the mac header might not be set. */
-	skb_reset_mac_header(skb);
 	if (batadv_bla_process_claim(bat_priv, primary_if, skb))
 		goto handled;


More information about the linux-merge mailing list