Commit 80e2b1fa authored by Lukas Bulwahn's avatar Lukas Bulwahn Committed by Johannes Berg
Browse files

wifi: mac80211: clean up a needless assignment in ieee80211_sta_activate_link() 



Commit 177577db ("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: default avatarLukas Bulwahn <lukas.bulwahn@gmail.com>
Link: https://lore.kernel.org/r/20220812103126.25308-1-lukas.bulwahn@gmail.com


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 3579f4c2

net/mac80211/sta_info.c

+1 −3
Original line number Diff line number Diff line
@@ -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);