diff options
| author |   Linus Lüssing <linus.luessing@web.de> | 2014-01-19 22:22:46 +0100 |
|---|---|---|
| committer |   Antonio Quartulli <antonio@meshcoding.com> | 2014-03-22 08:50:26 +0100 |
| commit | e88b617d84b53170f0781cc0756019c5b1855890 (patch) | |
| tree | f930946e3e2bcb16dae1be0a0ddedde4780f3471 /net | |
| parent | batman-adv: use vlan_/eth_hdr() instead of skb->data in interface_tx path (diff) | |
| download | linux-dev-e88b617d84b53170f0781cc0756019c5b1855890.tar.xz linux-dev-e88b617d84b53170f0781cc0756019c5b1855890.zip | |
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@web.de>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/batman-adv/bridge_loop_avoidance.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index 73d83727d66a..70d781a362be 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; |