The following commit has been merged in the master branch: commit 2b1e2cb3594df80446dc33bb8e12230da11f38ff Author: Antonio Quartulli antonio@meshcoding.com Date: Mon Dec 23 21:43:39 2013 +0100

batman-adv: fix vlan header access

When batadv_get_vid() is invoked in interface_rx() the batman-adv header has already been removed, therefore the header_len argument has to be 0.

Introduced by c018ad3de61a1dc4194879a53e5559e094aa7b1a ("batman-adv: add the VLAN ID attribute to the TT entry")

Signed-off-by: Antonio Quartulli antonio@meshcoding.com Signed-off-by: Marek Lindner mareklindner@neomailbox.ch

diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 875a702..a8f99d1 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -351,7 +351,7 @@ void batadv_interface_rx(struct net_device *soft_iface, */ nf_reset(skb);

- vid = batadv_get_vid(skb, hdr_size); + vid = batadv_get_vid(skb, 0); ethhdr = eth_hdr(skb);

switch (ntohs(ethhdr->h_proto)) {