diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-05-20 00:20:49 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2013-07-12 00:03:13 +0200 |
| commit | 9815d07c6613ebd2807d37b555a7af288349f031 (patch) | |
| tree | 8fa33d557b813b4532e63c61e4fcc123eb8b4f9c | |
| parent | c918a4f9404d29ff510d08caea3f1f6847a6787a (diff) | |
backports: do not add the vlan backports for kernel 3.10
Upstream commit 3fc43d6f57044d0cf8003dc8bc30749931b6a727
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>
| -rw-r--r-- | backport/backport-include/linux/if_vlan.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/backport/backport-include/linux/if_vlan.h b/backport/backport-include/linux/if_vlan.h index a5839e8a..fea0accc 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_ */ |