wifi: mac80211: clean up 'ret' in sta_link_apply_parameters()

[ Upstream commit 642508a42f74d7467aae7c56dff3016db64a25bd ]

There's no need to have the always-zero ret variable in
the function scope, move it into the inner scope only.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20240605135233.eb7a24632d98.I72d7fe1da89d4b89bcfd0f5fb9057e3e69355cfe@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Stable-dep-of: 819e0f1e58e0 ("wifi: mac80211: fix station NSS capability initialization order")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index c0dccaceb05e6e9969a9315a710a3b8cfbd1bb79..aa5daa2fad1111cbe17c254faec59d446f2f894f 100644 (file)
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1683,7 +1683,6 @@ static int sta_link_apply_parameters(struct ieee80211_local *local,
                                     struct sta_info *sta, bool new_link,
                                     struct link_station_parameters *params)
 {
-       int ret = 0;
        struct ieee80211_supported_band *sband;
        struct ieee80211_sub_if_data *sdata = sta->sdata;
        u32 link_id = params->link_id < 0 ? 0 : params->link_id;
@@ -1725,6 +1724,8 @@ static int sta_link_apply_parameters(struct ieee80211_local *local,
        }
 
        if (params->txpwr_set) {
+               int ret;
+
                link_sta->pub->txpwr.type = params->txpwr.type;
                if (params->txpwr.type == NL80211_TX_POWER_LIMITED)
                        link_sta->pub->txpwr.power = params->txpwr.power;
@@ -1777,7 +1778,7 @@ static int sta_link_apply_parameters(struct ieee80211_local *local,
 
        ieee80211_sta_init_nss(link_sta);
 
-       return ret;
+       return 0;
 }
 
 static int sta_apply_parameters(struct ieee80211_local *local,