From: Hauke Mehrtens Date: Sun, 19 May 2013 22:20:49 +0000 (+0200) Subject: backport: do not add the vlan backports for kernel 3.10 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3fc43d6f57044d0cf8003dc8bc30749931b6a727;p=openwrt%2Fstaging%2Fblogic.git backport: do not add the vlan backports for kernel 3.10 The kernel 3.10 already includes the new versions. Signed-off-by: Hauke Mehrtens Signed-off-by: Luis R. Rodriguez --- diff --git a/backport/backport-include/linux/if_vlan.h b/backport/backport-include/linux/if_vlan.h index a5839e8a7a5b..fea0accc834f 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 +#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_ */