diff options
| author | Lukas Bulwahn | 2022-08-12 12:31:26 +0200 |
|---|---|---|
| committer | Johannes Berg | 2022-08-25 11:02:44 +0200 |
| commit | 80e2b1fadbb6f92abbc57f2c918a6589ceba3cf1 (patch) | |
| tree | 9917358bdad8749f50c35963c6058042b282cac1 /net/mac80211 | |
| parent | 3579f4c28e77a8a19cb804ab7f7ea6843c50f6ad (diff) | |
wifi: mac80211: clean up a needless assignment in ieee80211_sta_activate_link()
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@gmail.com>
Link: https://lore.kernel.org/r/20220812103126.25308-1-lukas.bulwahn@gmail.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/sta_info.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index 6649c2483e49..4944d929def6 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -2778,10 +2778,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); |