diff options
| author | Antonio Quartulli <antonio@meshcoding.com> | 2013-12-23 15:43:39 -0500 |
|---|---|---|
| committer | Antonio Quartulli <antonio@meshcoding.com> | 2013-12-28 08:48:40 -0500 |
| commit | 2b1e2cb3594df80446dc33bb8e12230da11f38ff (patch) | |
| tree | f692cb05d9ee37001616641c1597b064ad83874b /net/batman-adv | |
| parent | 55883fd1048e09f5b6e1edaf0caf7e4f6f31f971 (diff) | |
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>
Diffstat (limited to 'net/batman-adv')
| -rw-r--r-- | net/batman-adv/soft-interface.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 875a702542c2..a8f99d1486c0 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, | |||
| 351 | */ | 351 | */ |
| 352 | nf_reset(skb); | 352 | nf_reset(skb); |
| 353 | 353 | ||
| 354 | vid = batadv_get_vid(skb, hdr_size); | 354 | vid = batadv_get_vid(skb, 0); |
| 355 | ethhdr = eth_hdr(skb); | 355 | ethhdr = eth_hdr(skb); |
| 356 | 356 | ||
| 357 | switch (ntohs(ethhdr->h_proto)) { | 357 | switch (ntohs(ethhdr->h_proto)) { |