kernel: Update kernel 4.19 to version 4.19.138
[openwrt/staging/dedeckeh.git] / target / linux / generic / hack-4.19 / 641-sch_cake-fix-IP-protocol-handling-in-the-presence-of.patch
index e651743c1db64c6105910f36ef461c06b882327b..c962b710681af05e0133894367c4a9087a65bfeb 100644 (file)
@@ -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_);