From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Tue, 11 Aug 2020 10:31:19 +0000 (+0200)
Subject: kernel: Fix cake patch for kernel 4.19.138
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c43af7a6cb3303dba044595a6acd8dc8b9d3d046;p=openwrt%2Fstaging%2Fadrian.git

kernel: Fix cake patch for kernel 4.19.138

This fixes the following build problem with cake:
net/sched/act_ctinfo.c: In function 'tcf_ctinfo_act':
net/sched/act_ctinfo.c:99:6: error: implicit declaration of function 'tc_skb_protocol'; did you mean 'skb_protocol'? [-Werror=implicit-function-declaration]
  if (tc_skb_protocol(skb) == htons(ETH_P_IP)) {
      ^~~~~~~~~~~~~~~
      skb_protocol
  CC [M]  net/sched/sch_hfsc.o

Fixes: fdac05b7416b ("kernel: Update kernel 4.19 to version 4.19.138")
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---

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 a680402f26..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 <ldir@darbyshire-bryant.me.uk>
 +	action = READ_ONCE(ca->tcf_action);
 +
 +	wlen = skb_network_offset(skb);
-+	if (tc_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 (tc_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;