kernel: bump 4.14 to 4.14.13

[openwrt/staging/lynxis.git] / target / linux / octeon / patches-4.14 / 110-er200-ethernet_probe_order.patch

diff --git a/target/linux/octeon/patches-4.14/110-er200-ethernet_probe_order.patch b/target/linux/octeon/patches-4.14/110-er200-ethernet_probe_order.patch
index 1df3f6a67554e9df2d33c5312a6c2282b4099804..6b1eaf92a2b0c06b7e416700437898f2513e89ab 100644 (file)
--- a/target/linux/octeon/patches-4.14/110-er200-ethernet_probe_order.patch
+++ b/target/linux/octeon/patches-4.14/110-er200-ethernet_probe_order.patch
@@ -1,14 +1,14 @@
 --- a/drivers/staging/octeon/ethernet.c
 +++ b/drivers/staging/octeon/ethernet.c
-@@ -684,6 +684,7 @@ static int cvm_oct_probe(struct platform
+@@ -673,6 +673,7 @@ static int cvm_oct_probe(struct platform
        int interface;
        int fau = FAU_NUM_PACKET_BUFFERS_TO_FREE;
        int qos;
 +      int i;
        struct device_node *pip;
+       int mtu_overhead = ETH_HLEN + ETH_FCS_LEN;
  
-       octeon_mdiobus_force_mod_depencency();
-@@ -800,13 +801,19 @@ static int cvm_oct_probe(struct platform
+@@ -796,13 +797,19 @@ static int cvm_oct_probe(struct platform
        }
  
        num_interfaces = cvmx_helper_get_number_of_interfaces();