11d88dee1c
Reorder and update existing patches
Signed-off-by: Felix Fietkau <nbd@nbd.name>
(cherry picked from commit 6407ef8d2b)
[rmilecki: rebase & fix mt76 compilation]
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
From b9133f3ef5a2659730cf47a74bd0a9259f1cf8ff Mon Sep 17 00:00:00 2001
|
|
From: Ansuel Smith <ansuelsmth@gmail.com>
|
|
Date: Mon, 22 Nov 2021 16:23:40 +0100
|
|
Subject: net: dsa: qca8k: remove redundant check in parse_port_config
|
|
|
|
The very next check for port 0 and 6 already makes sure we don't go out
|
|
of bounds with the ports_config delay table.
|
|
Remove the redundant check.
|
|
|
|
Reported-by: kernel test robot <lkp@intel.com>
|
|
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
|
|
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
|
|
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/dsa/qca8k.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/drivers/net/dsa/qca8k.c
|
|
+++ b/drivers/net/dsa/qca8k.c
|
|
@@ -983,7 +983,7 @@ qca8k_parse_port_config(struct qca8k_pri
|
|
u32 delay;
|
|
|
|
/* We have 2 CPU port. Check them */
|
|
- for (port = 0; port < QCA8K_NUM_PORTS && cpu_port_index < QCA8K_NUM_CPU_PORTS; port++) {
|
|
+ for (port = 0; port < QCA8K_NUM_PORTS; port++) {
|
|
/* Skip every other port */
|
|
if (port != 0 && port != 6)
|
|
continue;
|