Skip to content

Commit

Permalink
batman-adv: fix vlan header access
Browse files Browse the repository at this point in the history
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 c018ad3
("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>
  • Loading branch information
Antonio Quartulli committed Dec 28, 2013
1 parent 55883fd commit 2b1e2cb
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion net/batman-adv/soft-interface.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down

0 comments on commit 2b1e2cb

Please sign in to comment.