[PATCH v2] wifi: mac80211: clean up a needless assignment in ieee80211_sta_activate_link()

From: Lukas Bulwahn
Date: Fri Aug 12 2022 - 06:31:54 EST


Commit 177577dbd223 ("wifi: mac80211: sta_info: fix link_sta insertion")
makes ieee80211_sta_activate_link() return 0 in the 'hash' label case.
Hence, setting ret in the !test_sta_flag(...) branch to zero is not needed
anymore and can be dropped.

Remove a needless assignment.

No functional change. No change in object code.

Signed-off-by: Lukas Bulwahn <lukas.bulwahn@xxxxxxxxx>
---
v1 -> v2: remove the needless braces.

net/mac80211/sta_info.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index cb23da9aff1e..8402a5a65370 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -2777,10 +2777,8 @@ int ieee80211_sta_activate_link(struct sta_info *sta, unsigned int link_id)

sta->sta.valid_links = new_links;

- if (!test_sta_flag(sta, WLAN_STA_INSERTED)) {
- ret = 0;
+ if (!test_sta_flag(sta, WLAN_STA_INSERTED))
goto hash;
- }

ret = drv_change_sta_links(sdata->local, sdata, &sta->sta,
old_links, new_links);
--
2.17.1