diff mbox

[v6,2/2] batman-adv: remove obsolete skb_reset_mac_header() in batadv_bla_tx()

Message ID 1390166566-8315-3-git-send-email-linus.luessing@web.de (mailing list archive)
State Accepted, archived
Headers

Commit Message

Linus Lüssing Jan. 19, 2014, 9:22 p.m. UTC 
  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@web.de>
---
 bridge_loop_avoidance.c |    3 ---
 1 file changed, 3 deletions(-)

Comments

Marek Lindner Jan. 27, 2014, 7:39 a.m. UTC | #1 
On Sunday 19 January 2014 22:22:46 Linus Lüssing wrote:
> 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@web.de>
> ---
>  bridge_loop_avoidance.c |    3 ---
>  1 file changed, 3 deletions(-)

Applied in revision a093442.

Thanks,
Marek
diff mbox

Patch

diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c
index 407299a..e69d795 100644
--- a/bridge_loop_avoidance.c
+++ b/bridge_loop_avoidance.c
@@ -1535,9 +1535,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;