domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: Fix cake patch for kernel 4.19.138

Browse Source 
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: fdac05b741 ("kernel: Update kernel 4.19 to version 4.19.138")
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Hauke Mehrtens
2020-08-11 12:31:19 +02:00
parent 2e8785d68c
commit c43af7a6cb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
target/linux/generic/backport-4.19/380-v5.3-net-sched-Introduce-act_ctinfo-action.patch
View File

@@ -336,13 +336,13 @@ Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
+ action = READ_ONCE(ca->tcf_action); + action = READ_ONCE(ca->tcf_action);
+ +
+ wlen = skb_network_offset(skb); + 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); + wlen += sizeof(struct iphdr);
+ if (!pskb_may_pull(skb, wlen)) + if (!pskb_may_pull(skb, wlen))
+ goto out; + goto out;
+ +
+ proto = NFPROTO_IPV4; + 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); + wlen += sizeof(struct ipv6hdr);
+ if (!pskb_may_pull(skb, wlen)) + if (!pskb_may_pull(skb, wlen))
+ goto out; + goto out;