aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/octeon/patches-4.14/110-er200-ethernet_probe_order.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2020-11-10 15:33:17 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2020-11-16 09:35:05 +0100
commitac5297340e647c63f98278eadc2f189608d4cd62 (patch)
treeab0ca9c4b4c1f962d790b2bd9d8055b2e041e80e /target/linux/octeon/patches-4.14/110-er200-ethernet_probe_order.patch
parent589c3cf4e08731e4971d2db6c83e16b5ab959878 (diff)
downloadupstream-ac5297340e647c63f98278eadc2f189608d4cd62.tar.gz
upstream-ac5297340e647c63f98278eadc2f189608d4cd62.tar.bz2
upstream-ac5297340e647c63f98278eadc2f189608d4cd62.zip
kernel: bump 4.14 to 4.14.206
Refreshed all patches. Altered patches: - 210-dwc2_defaults.patch - 708-mc-bus-support-layerscape.patch Fixes: - CVE-2020-25656 Compile-tested on: ar71xx, cns3xxx, imx6, x86_64 Runtime-tested on: ar71xx, cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
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.patch4
1 files changed, 2 insertions, 2 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 6b1eaf92a2..e5330ffbd6 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,6 +1,6 @@
--- a/drivers/staging/octeon/ethernet.c
+++ b/drivers/staging/octeon/ethernet.c
-@@ -673,6 +673,7 @@ static int cvm_oct_probe(struct platform
+@@ -674,6 +674,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;
-@@ -796,13 +797,19 @@ static int cvm_oct_probe(struct platform
+@@ -797,13 +798,19 @@ static int cvm_oct_probe(struct platform
}
num_interfaces = cvmx_helper_get_number_of_interfaces();