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 <hauke@hauke-m.de>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>

diff --git a/backport/backport-include/linux/if_vlan.h b/backport/backport-include/linux/if_vlan.h
index a5839e8a7a5b13feaa6feb5cd7cdf0b485e9852a..fea0accc834fbe1089854e583e2cceef441476b2 100644 (file)
--- 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_ */