Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
commit 6f27447cbd4925a5fa42f17fd94f51574579f7a8 Author: Antonio Quartulli antonio@open-mesh.com Date: Thu Jul 4 17:54:51 2013 +0200
batman-adv: fix vlan compat code
A define has been accidentally put inside a wrong ifdef block. Move it out.
Introduced by 952cebb57518ec18dfdebfcb2b85539f58f20779 ("batman-adv: add per VLAN interface attribute framework")
Signed-off-by: Antonio Quartulli antonio@open-mesh.com Signed-off-by: Marek Lindner lindner_marek@yahoo.de
6f27447cbd4925a5fa42f17fd94f51574579f7a8 compat.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/compat.h b/compat.h index 457be3d..4eb0537 100644 --- a/compat.h +++ b/compat.h @@ -325,10 +325,10 @@ static int __batadv_interface_set_mac_addr(x, y) #include <linux/if_vlan.h> #define vlan_insert_tag(skb, proto, vid) vlan_insert_tag(skb, vid)
-#define NETIF_F_HW_VLAN_CTAG_FILTER NETIF_F_HW_VLAN_FILTER - #endif /* vlan_insert_tag */
+#define NETIF_F_HW_VLAN_CTAG_FILTER NETIF_F_HW_VLAN_FILTER + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0)
#define batadv_interface_add_vid(x, y, z) \