wifi: mac80211: clean up a needless assignment in ieee80211_sta_activate_link()
authorLukas Bulwahn <lukas.bulwahn@gmail.com>
Fri, 12 Aug 2022 10:31:26 +0000 (12:31 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Thu, 25 Aug 2022 09:02:44 +0000 (11:02 +0200)
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>
net/mac80211/sta_info.c

index 6649c2483e49afbb931d7bdf320f602578942e06..4944d929def674feb47442a8e149464763da5988 100644 (file)
@@ -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);