mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
ac5297340e
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>
35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
--- a/drivers/staging/octeon/ethernet.c
|
|
+++ b/drivers/staging/octeon/ethernet.c
|
|
@@ -674,6 +674,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;
|
|
|
|
@@ -797,13 +798,19 @@ static int cvm_oct_probe(struct platform
|
|
}
|
|
|
|
num_interfaces = cvmx_helper_get_number_of_interfaces();
|
|
- for (interface = 0; interface < num_interfaces; interface++) {
|
|
- cvmx_helper_interface_mode_t imode =
|
|
- cvmx_helper_interface_get_mode(interface);
|
|
- int num_ports = cvmx_helper_ports_on_interface(interface);
|
|
+ for (i = 0; i < num_interfaces; i++) {
|
|
+ cvmx_helper_interface_mode_t imode;
|
|
+ int interface;
|
|
+ int num_ports;
|
|
int port;
|
|
int port_index;
|
|
|
|
+ interface = i;
|
|
+ if (cvmx_sysinfo_get()->board_type == CVMX_BOARD_TYPE_UBNT_E200)
|
|
+ interface = num_interfaces - (i + 1);
|
|
+
|
|
+ num_ports = cvmx_helper_ports_on_interface(interface);
|
|
+ imode = cvmx_helper_interface_get_mode(interface);
|
|
for (port_index = 0,
|
|
port = cvmx_helper_get_ipd_port(interface, 0);
|
|
port < cvmx_helper_get_ipd_port(interface, num_ports);
|