diff options
| author | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2018-01-10 14:06:52 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2018-01-11 20:34:33 +0100 |
| commit | 7c7586b6d05926f2d9538dbd9fce9d31df706caa (patch) | |
| tree | 877c2b947b5a0641ca9d6ac27b59f4dac0d48903 /target/linux/octeon/patches-4.14/110-er200-ethernet_probe_order.patch | |
| parent | eceff9ea8f6392132c1fef74f5b822c28a5f24ec (diff) | |
| download | upstream-7c7586b6d05926f2d9538dbd9fce9d31df706caa.tar.gz upstream-7c7586b6d05926f2d9538dbd9fce9d31df706caa.tar.bz2 upstream-7c7586b6d05926f2d9538dbd9fce9d31df706caa.zip | |
kernel: bump 4.14 to 4.14.13
Refresh patches
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Diffstat (limited to 'target/linux/octeon/patches-4.14/110-er200-ethernet_probe_order.patch')
| -rw-r--r-- | target/linux/octeon/patches-4.14/110-er200-ethernet_probe_order.patch | 6 |
1 files changed, 3 insertions, 3 deletions
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 1df3f6a675..6b1eaf92a2 100644 --- 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(); |