From cb9d0994dd517ee9837b43b9149536e5420254cf Mon Sep 17 00:00:00 2001 From: ElonH Date: Thu, 30 Jul 2020 11:18:38 +0800 Subject: [PATCH] kernel-4.19: skb_protocol missing args --- .../380-v5.3-net-sched-Introduce-act_ctinfo-action.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/linux/generic/backport-4.19/380-v5.3-net-sched-Introduce-act_ctinfo-action.patch b/target/linux/generic/backport-4.19/380-v5.3-net-sched-Introduce-act_ctinfo-action.patch index c80b36f3af..cf7687b451 100644 --- a/target/linux/generic/backport-4.19/380-v5.3-net-sched-Introduce-act_ctinfo-action.patch +++ b/target/linux/generic/backport-4.19/380-v5.3-net-sched-Introduce-act_ctinfo-action.patch @@ -336,13 +336,13 @@ Signed-off-by: Kevin Darbyshire-Bryant + action = READ_ONCE(ca->tcf_action); + + wlen = skb_network_offset(skb); -+ if (skb_protocol(skb) == htons(ETH_P_IP)) { ++ if (skb_protocol(skb, true) == htons(ETH_P_IP)) { + wlen += sizeof(struct iphdr); + if (!pskb_may_pull(skb, wlen)) + goto out; + + proto = NFPROTO_IPV4; -+ } else if (skb_protocol(skb) == htons(ETH_P_IPV6)) { ++ } else if (skb_protocol(skb, true) == htons(ETH_P_IPV6)) { + wlen += sizeof(struct ipv6hdr); + if (!pskb_may_pull(skb, wlen)) + goto out;