aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/hack-4.19/641-sch_cake-fix-IP-protocol-handling-in-the-presence-of.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2020-07-31 19:41:26 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2020-08-10 19:34:37 +0200
commitfdac05b7416b7355f565065bdbc158e0ede7133e (patch)
tree7b3390b953cfd4880d399b6906a7c3f056adc34d /target/linux/generic/hack-4.19/641-sch_cake-fix-IP-protocol-handling-in-the-presence-of.patch
parentfce0f1501b12b54c0961802ff10b4b5f24a1a33d (diff)
downloadupstream-fdac05b7416b7355f565065bdbc158e0ede7133e.tar.gz
upstream-fdac05b7416b7355f565065bdbc158e0ede7133e.tar.bz2
upstream-fdac05b7416b7355f565065bdbc158e0ede7133e.zip
kernel: Update kernel 4.19 to version 4.19.138
Compile and run tested on lantiq/xrx200 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/hack-4.19/641-sch_cake-fix-IP-protocol-handling-in-the-presence-of.patch')
-rw-r--r--target/linux/generic/hack-4.19/641-sch_cake-fix-IP-protocol-handling-in-the-presence-of.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/hack-4.19/641-sch_cake-fix-IP-protocol-handling-in-the-presence-of.patch b/target/linux/generic/hack-4.19/641-sch_cake-fix-IP-protocol-handling-in-the-presence-of.patch
index e651743c1d..c962b71068 100644
--- a/target/linux/generic/hack-4.19/641-sch_cake-fix-IP-protocol-handling-in-the-presence-of.patch
+++ b/target/linux/generic/hack-4.19/641-sch_cake-fix-IP-protocol-handling-in-the-presence-of.patch
@@ -98,7 +98,7 @@ Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
bool rev = !skb->_nfct, upd = false;
__be32 ip;
-- if (tc_skb_protocol(skb) != htons(ETH_P_IP))
+- if (skb_protocol(skb, true) != htons(ETH_P_IP))
+ if (cake_skb_proto(skb) != htons(ETH_P_IP))
return false;
@@ -107,7 +107,7 @@ Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
u16 *buf, buf_;
u8 dscp;
-- switch (tc_skb_protocol(skb)) {
+- switch (skb_protocol(skb, true)) {
+ switch (cake_skb_proto(skb)) {
case htons(ETH_P_IP):
buf = skb_header_pointer(skb, offset, sizeof(buf_), &buf_);