mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 17:48:58 +00:00
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>
41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
From 0898ca67b86e14207d4feb3f3fea8b87cec5aab1 Mon Sep 17 00:00:00 2001
|
|
From: Ansuel Smith <ansuelsmth@gmail.com>
|
|
Date: Tue, 23 Nov 2021 16:44:46 +0100
|
|
Subject: net: dsa: qca8k: fix warning in LAG feature
|
|
|
|
Fix warning reported by bot.
|
|
Make sure hash is init to 0 and fix wrong logic for hash_type in
|
|
qca8k_lag_can_offload.
|
|
|
|
Reported-by: kernel test robot <lkp@intel.com>
|
|
Fixes: def975307c01 ("net: dsa: qca8k: add LAG support")
|
|
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
|
|
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
|
|
Link: https://lore.kernel.org/r/20211123154446.31019-1-ansuelsmth@gmail.com
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/dsa/qca8k.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/net/dsa/qca8k.c
|
|
+++ b/drivers/net/dsa/qca8k.c
|
|
@@ -2251,7 +2251,7 @@ qca8k_lag_can_offload(struct dsa_switch
|
|
if (info->tx_type != NETDEV_LAG_TX_TYPE_HASH)
|
|
return false;
|
|
|
|
- if (info->hash_type != NETDEV_LAG_HASH_L2 ||
|
|
+ if (info->hash_type != NETDEV_LAG_HASH_L2 &&
|
|
info->hash_type != NETDEV_LAG_HASH_L23)
|
|
return false;
|
|
|
|
@@ -2265,8 +2265,8 @@ qca8k_lag_setup_hash(struct dsa_switch *
|
|
{
|
|
struct qca8k_priv *priv = ds->priv;
|
|
bool unique_lag = true;
|
|
+ u32 hash = 0;
|
|
int i, id;
|
|
- u32 hash;
|
|
|
|
id = dsa_lag_id(ds->dst, lag);
|
|
|