The kernel 3.10 already includes the new versions.
Signed-off-by: Hauke Mehrtens <[email protected]>
---
This should also go into the 3.10 branch
backport/backport-include/linux/if_vlan.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/backport/backport-include/linux/if_vlan.h
b/backport/backport-include/linux/if_vlan.h
index a5839e8..fea0acc 100644
--- a/backport/backport-include/linux/if_vlan.h
+++ b/backport/backport-include/linux/if_vlan.h
@@ -2,6 +2,7 @@
#define __BACKPORT_LINUX_IF_VLAN_H_
#include_next <linux/if_vlan.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
#define vlan_insert_tag(__skb, __vlan_proto, __vlan_tci)
vlan_insert_tag(__skb, __vlan_tci)
#define __vlan_put_tag(__skb, __vlan_proto, __vlan_tci)
__vlan_put_tag(__skb, __vlan_tci)
#define vlan_put_tag(__skb, __vlan_proto, __vlan_tci)
vlan_put_tag(__skb, __vlan_tci)
@@ -14,5 +15,6 @@ static inline bool vlan_hw_offload_capable(netdev_features_t
features,
return true;
return false;
}
+#endif
#endif /* __BACKPORT_LINUX_IF_VLAN_H_ */
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe backports" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
