diff options
Diffstat (limited to 'kernel/include/linux/netfilter/ipset/ip_set_compat.h.in')
| -rw-r--r-- | kernel/include/linux/netfilter/ipset/ip_set_compat.h.in | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in b/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in index fe24255..062becb 100644 --- a/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in +++ b/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in @@ -33,6 +33,7 @@ #@HAVE_NLA_PUT_IN_ADDR@ HAVE_NLA_PUT_IN_ADDR #@HAVE_NET_IN_NFNL_CALLBACK_FN@ HAVE_NET_IN_NFNL_CALLBACK_FN #@HAVE_EXPORT_SYMBOL_GPL_IN_MODULE_H@ HAVE_EXPORT_SYMBOL_GPL_IN_MODULE_H +#@HAVE_TC_SKB_PROTOCOL@ HAVE_TC_SKB_PROTOCOL #ifdef HAVE_EXPORT_SYMBOL_GPL_IN_MODULE_H #include <linux/module.h> @@ -273,6 +274,16 @@ static inline int nla_put_in6_addr(struct sk_buff *skb, int attrtype, #define IPSET_SOCK_NET(net, ctnl) sock_net(ctnl) #endif +#ifndef HAVE_TC_SKB_PROTOCOL +#include <linux/if_vlan.h> +static inline __be16 tc_skb_protocol(const struct sk_buff *skb) +{ + if (vlan_tx_tag_present(skb)) + return skb->vlan_proto; + return skb->protocol; +} +#endif + #ifndef smp_mb__before_atomic #define smp_mb__before_atomic() smp_mb() #define smp_mb__after_atomic() smp_mb() |