From e659b434019d842ddc29cb60a11410ccc8abbbef Mon Sep 17 00:00:00 2001 From: Alaa Hleihel Date: Sun, 28 Sep 2014 12:02:19 +0300 Subject: [PATCH] compat: Prevent redefining ETH_FLAG_TXVLAN/ETH_FLAG_RXVLAN. Signed-off-by: Alaa Hleihel --- include/linux/compat-2.6.37.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/linux/compat-2.6.37.h b/include/linux/compat-2.6.37.h index bc1774b..17a978d 100644 --- a/include/linux/compat-2.6.37.h +++ b/include/linux/compat-2.6.37.h @@ -222,10 +222,12 @@ static inline bool skb_has_frag_list(const struct sk_buff *skb) * * Adding missing enums for ethtool_flags in 2.6.32 kernel. */ +#ifndef CONFIG_COMPAT_IS_ETH_FLAG_TXVLAN enum additional_ethtool_flags { ETH_FLAG_TXVLAN = (1 << 7), /* TX VLAN offload enabled */ ETH_FLAG_RXVLAN = (1 << 8), /* RX VLAN offload enabled */ }; +#endif extern void unregister_netdevice_queue(struct net_device *dev, struct list_head *head); -- 2.41.0