diff options
| author | Jozsef Kadlecsik <kadlec@netfilter.org> | 2022-11-07 21:50:05 +0100 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@netfilter.org> | 2022-11-07 21:50:05 +0100 |
| commit | 6aa65d00f6a7305310eec05218b9ab9dea396658 (patch) | |
| tree | aa29ef1b8c07806a7d3edf0a088835accd52f4a7 | |
| parent | b0a56bb18f10e5be0c2bf668ce50c0203c2b2bdb (diff) | |
compatibility: move to skb_protocol in the code from tc_skb_protocol
And fix a typo committed by me in em_sched.c too.
| -rw-r--r-- | kernel/include/linux/netfilter/ipset/ip_set_compat.h.in | 8 | ||||
| -rw-r--r-- | kernel/net/sched/em_ipset.c | 2 |
2 files changed, 4 insertions, 6 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 4d2c446..6a4b071 100644 --- a/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in +++ b/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in @@ -406,11 +406,9 @@ static inline int nla_put_in6_addr(struct sk_buff *skb, int attrtype, #define skb_vlan_tag_present vlan_tx_tag_present #endif -static inline __be16 tc_skb_protocol(const struct sk_buff *skb) +#ifndef HAVE_SKB_PROTOCOL +static inline __be16 skb_protocol(const struct sk_buff *skb, bool skip_vlan) { -#ifdef HAVE_SKB_PROTOCOL - return skb_protocol(skb, true); -#else if (skb_vlan_tag_present(skb)) #ifdef HAVE_VLAN_PROTO_IN_SK_BUFF return skb->vlan_proto; @@ -418,9 +416,9 @@ static inline __be16 tc_skb_protocol(const struct sk_buff *skb) return htons(ETH_P_8021Q); #endif return skb->protocol; -#endif } #endif +#endif #ifdef HAVE_XT_NET #define IPSET_DEV_NET(par) xt_net(par) diff --git a/kernel/net/sched/em_ipset.c b/kernel/net/sched/em_ipset.c index 4f7184a..5428f8d 100644 --- a/kernel/net/sched/em_ipset.c +++ b/kernel/net/sched/em_ipset.c @@ -84,7 +84,7 @@ static int em_ipset_match(struct sk_buff *skb, struct tcf_ematch *em, #else #define ACPAR_FAMILY(f) acpar.family = f #endif - switch (skb_protocol((skb, true)) { + switch (skb_protocol(skb, true)) { case htons(ETH_P_IP): ACPAR_FAMILY(NFPROTO_IPV4); if (!pskb_network_may_pull(skb, sizeof(struct iphdr))) |