bcm4908: backport bcm4908_enet fix for NULL dereference

[openwrt/staging/jow.git] / target / linux / bcm4908 / patches-5.10 / 079-v6.2-0001-net-broadcom-bcm4908_enet-use-build_skb.patch

diff --git a/target/linux/bcm4908/patches-5.10/079-v6.2-0001-net-broadcom-bcm4908_enet-use-build_skb.patch b/target/linux/bcm4908/patches-5.10/079-v6.2-0001-net-broadcom-bcm4908_enet-use-build_skb.patch
index 1a3dc62d444dffd74258edb36b49b4a12aac0fde..834973f5c7812c88c093e8a8037c2ee7d680e315 100644 (file)
--- a/target/linux/bcm4908/patches-5.10/079-v6.2-0001-net-broadcom-bcm4908_enet-use-build_skb.patch
+++ b/target/linux/bcm4908/patches-5.10/079-v6.2-0001-net-broadcom-bcm4908_enet-use-build_skb.patch
@@ -112,7 +112,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
        }
  }
  
-@@ -576,6 +586,7 @@ static int bcm4908_enet_poll_rx(struct n
+@@ -574,6 +584,7 @@ static int bcm4908_enet_poll_rx(struct n
        while (handled < weight) {
                struct bcm4908_enet_dma_ring_bd *buf_desc;
                struct bcm4908_enet_dma_ring_slot slot;
@@ -120,7 +120,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
                u32 ctl;
                int len;
                int err;
-@@ -599,16 +610,24 @@ static int bcm4908_enet_poll_rx(struct n
+@@ -597,16 +608,24 @@ static int bcm4908_enet_poll_rx(struct n
  
                if (len < ETH_ZLEN ||
                    (ctl & (DMA_CTL_STATUS_SOP | DMA_CTL_STATUS_EOP)) != (DMA_CTL_STATUS_SOP | DMA_CTL_STATUS_EOP)) {