diff options
author | John Audia <graysky@archlinux.us> | 2021-08-09 10:47:18 -0400 |
---|---|---|
committer | David Bauer <mail@david-bauer.net> | 2021-08-14 20:25:19 +0200 |
commit | 02e2723ef317c65b6ddfc70144b10f9936cfc2af (patch) | |
tree | c2017456408e825752128c8c122f52437d940d7b /target/linux/octeon/patches-5.4/110-er200-ethernet_probe_order.patch | |
parent | 1235e2ee3bcfb678043a0b95ff1a6d4867af2561 (diff) | |
download | upstream-02e2723ef317c65b6ddfc70144b10f9936cfc2af.tar.gz upstream-02e2723ef317c65b6ddfc70144b10f9936cfc2af.tar.bz2 upstream-02e2723ef317c65b6ddfc70144b10f9936cfc2af.zip |
kernel: bump 5.4 to 5.4.139
All patches automatically rebased.
Build system: x86_64
Build-tested: ipq806x/R7800
Run-tested: ipq806x/R7800
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/octeon/patches-5.4/110-er200-ethernet_probe_order.patch')
-rw-r--r-- | target/linux/octeon/patches-5.4/110-er200-ethernet_probe_order.patch | 4 |
1 files changed, 2 insertions, 2 deletions
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 7afa292757..1c04f5c57b 100644 --- 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(); |