| From f6087acb2acf2a491500336fa2f88d6327506570 Mon Sep 17 00:00:00 2001 |
| From: Antonio Quartulli <antonio@open-mesh.com> |
| Date: Wed, 11 Sep 2013 19:14:44 +0200 |
| Subject: batman-adv: set the TAG flag for the vid passed to BLA |
| |
| From: Antonio Quartulli <antonio@open-mesh.com> |
| |
| [ Upstream commit 4c18c425b2d228415b635e97a64737d7f27c5536 ] |
| |
| When receiving or sending a packet a packet on a VLAN, the |
| vid has to be marked with the TAG flag in order to make any |
| component in batman-adv understand that the packet is coming |
| from a really tagged network. |
| |
| This fix the Bridge Loop Avoidance behaviour which was not |
| able to send announces over VLAN interfaces. |
| |
| Introduced by 0b1da1765fdb00ca5d53bc95c9abc70dfc9aae5b |
| ("batman-adv: change VID semantic in the BLA code") |
| |
| Signed-off-by: Antonio Quartulli <antonio@open-mesh.org> |
| Acked-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de> |
| Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| net/batman-adv/soft-interface.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| --- 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 |
| 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; |
| @@ -329,6 +330,7 @@ void batadv_interface_rx(struct net_devi |
| 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; |
