diff options
| author | David S. Miller <davem@davemloft.net> | 2013-09-18 18:22:17 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-09-18 18:22:17 +0200 |
| commit | 4bdc944729032c9eb8aabadc7f36c01d83fd34e5 (patch) | |
| tree | 4ea1fffb7fe7d3c917257e8fc28d0d4de25e47d3 /net | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf (diff) | |
| parent | batman-adv: set the TAG flag for the vid passed to BLA (diff) | |
| download | linux-4bdc944729032c9eb8aabadc7f36c01d83fd34e5.tar.xz linux-4bdc944729032c9eb8aabadc7f36c01d83fd34e5.zip | |
Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge
Included change:
- fix the Bridge Loop Avoidance component by marking the variables containing
the VLAN ID with the HAS_TAG flag when needed.
Diffstat (limited to 'net')
| -rw-r--r-- | net/batman-adv/soft-interface.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 4493913f0d5c..813db4e64602 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -168,6 +168,7 @@ static int batadv_interface_tx(struct sk_buff *skb, case ETH_P_8021Q: vhdr = (struct vlan_ethhdr *)skb->data; vid = ntohs(vhdr->h_vlan_TCI) & VLAN_VID_MASK; + vid |= BATADV_VLAN_HAS_TAG; if (vhdr->h_vlan_encapsulated_proto != ethertype) break; @@ -331,6 +332,7 @@ void batadv_interface_rx(struct net_device *soft_iface, case ETH_P_8021Q: vhdr = (struct vlan_ethhdr *)skb->data; vid = ntohs(vhdr->h_vlan_TCI) & VLAN_VID_MASK; + vid |= BATADV_VLAN_HAS_TAG; if (vhdr->h_vlan_encapsulated_proto != ethertype) break; |