diff options
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | kernel/include/linux/netfilter/ipset/ip_set_compat.h.in | 11 | ||||
| -rw-r--r-- | kernel/net/sched/em_ipset.c | 2 |
3 files changed, 22 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index b73b3cc..f046e8b 100644 --- a/configure.ac +++ b/configure.ac @@ -487,6 +487,16 @@ else AC_SUBST(HAVE_EXPORT_SYMBOL_GPL_IN_MODULE_H, undef) fi +AC_MSG_CHECKING([kernel source for tc_skb_protocol in pkt_sched.h]) +if test -f $ksourcedir/include/net/pkt_sched.h && \ + $GREP -q 'tc_skb_protocol' $ksourcedir/include/net/pkt_sched.h; then + AC_MSG_RESULT(yes) + AC_SUBST(HAVE_TC_SKB_PROTOCOL, define) +else + AC_MSG_RESULT(no) + AC_SUBST(HAVE_TC_SKB_PROTOCOL, undef) +fi + AC_MSG_CHECKING([kernel source for struct net_generic]) if test -f $ksourcedir/include/net/netns/generic.h && \ $GREP -q 'struct net_generic' $ksourcedir/include/net/netns/generic.h; then 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() diff --git a/kernel/net/sched/em_ipset.c b/kernel/net/sched/em_ipset.c index bc1a2f1..87b8419 100644 --- a/kernel/net/sched/em_ipset.c +++ b/kernel/net/sched/em_ipset.c @@ -77,7 +77,7 @@ static int em_ipset_match(struct sk_buff *skb, struct tcf_ematch *em, struct net_device *dev, *indev = NULL; int ret, network_offset; - switch (skb->protocol) { + switch (tc_skb_protocol(skb)) { case htons(ETH_P_IP): acpar.family = NFPROTO_IPV4; if (!pskb_network_may_pull(skb, sizeof(struct iphdr))) |