kernel: bump 5.4 to 5.4.139

[openwrt/openwrt.git] / target / linux / mvebu / patches-5.4 / 005-net-mvneta-rely-on-build_skb-in-mvneta_rx_swbm-poll-.patch

diff --git a/target/linux/mvebu/patches-5.4/005-net-mvneta-rely-on-build_skb-in-mvneta_rx_swbm-poll-.patch b/target/linux/mvebu/patches-5.4/005-net-mvneta-rely-on-build_skb-in-mvneta_rx_swbm-poll-.patch
index 4d9539adbb0d1e2a87f59d7a7f89168469a294f3..869b22eefb59e405598bb057b04790c3cf883f06 100644 (file)
--- a/target/linux/mvebu/patches-5.4/005-net-mvneta-rely-on-build_skb-in-mvneta_rx_swbm-poll-.patch
+++ b/target/linux/mvebu/patches-5.4/005-net-mvneta-rely-on-build_skb-in-mvneta_rx_swbm-poll-.patch
@@ -292,7 +292,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                                        MVNETA_RX_BUF_SIZE(pp->pkt_size));
                mvneta_rxq_bm_disable(pp, rxq);
                mvneta_rxq_fill(pp, rxq, rxq->size);
-@@ -4715,7 +4720,7 @@ static int mvneta_probe(struct platform_
+@@ -4713,7 +4718,7 @@ static int mvneta_probe(struct platform_
        SET_NETDEV_DEV(dev, &pdev->dev);
  
        pp->id = global_port_id++;