Repository : ssh://git@open-mesh.org/batman-adv

On branch : next

commit c03be25aba23b39189f8e3858aed1dd03061a3ed 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 580d7919f19e4f73ccd79e82a532af2bdc638042 ("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

c03be25aba23b39189f8e3858aed1dd03061a3ed soft-interface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/soft-interface.c b/soft-interface.c index 875a702..a8f99d1 100644 --- a/soft-interface.c +++ b/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)) {