diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2020-08-11 12:31:19 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2020-08-11 21:11:53 +0200 |
| commit | c43af7a6cb3303dba044595a6acd8dc8b9d3d046 (patch) | |
| tree | 438278fa8f3c955a342af82e8f891f3301c4d0a1 | |
| parent | 2e8785d68cc0652632a6fcfb02b0b25299e9b267 (diff) | |
| download | upstream-c43af7a6cb3303dba044595a6acd8dc8b9d3d046.tar.gz upstream-c43af7a6cb3303dba044595a6acd8dc8b9d3d046.tar.bz2 upstream-c43af7a6cb3303dba044595a6acd8dc8b9d3d046.zip | |
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>
| -rw-r--r-- | target/linux/generic/backport-4.19/380-v5.3-net-sched-Introduce-act_ctinfo-action.patch | 4 |
1 files 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 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; |