kernel: bump 5.4 to 5.4.139

[openwrt/openwrt.git] / target / linux / octeon / patches-5.4 / 110-er200-ethernet_probe_order.patch

diff --git a/target/linux/octeon/patches-5.4/110-er200-ethernet_probe_order.patch b/target/linux/octeon/patches-5.4/110-er200-ethernet_probe_order.patch
index 7afa29275787dd54c1a49f9ee02874f4c5297e0f..1c04f5c57b80673ceccafc4a96f98d481d33166c 100644 (file)
--- a/target/linux/octeon/patches-5.4/110-er200-ethernet_probe_order.patch
+++ b/target/linux/octeon/patches-5.4/110-er200-ethernet_probe_order.patch
@@ -1,6 +1,6 @@
 --- a/drivers/staging/octeon/ethernet.c
 +++ b/drivers/staging/octeon/ethernet.c
-@@ -683,6 +683,7 @@ static int cvm_oct_probe(struct platform
+@@ -679,6 +679,7 @@ static int cvm_oct_probe(struct platform
        int interface;
        int fau = FAU_NUM_PACKET_BUFFERS_TO_FREE;
        int qos;
@@ -8,7 +8,7 @@
        struct device_node *pip;
        int mtu_overhead = ETH_HLEN + ETH_FCS_LEN;
  
-@@ -806,13 +807,19 @@ static int cvm_oct_probe(struct platform
+@@ -802,13 +803,19 @@ static int cvm_oct_probe(struct platform
        }
  
        num_interfaces = cvmx_helper_get_number_of_interfaces();