diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-09-11 16:14:31 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2019-10-04 13:47:12 +0200 |
| commit | 020fa0f2f03ad7ef9c51cfda6a156b3cdf86b631 (patch) | |
| tree | bf868493adabb78f53699651c7279b52cc3e6d05 /net/mac80211/ibss.c | |
| parent | net: propagate errors correctly in register_netdevice() (diff) | |
| download | linux-020fa0f2f03ad7ef9c51cfda6a156b3cdf86b631.tar.xz linux-020fa0f2f03ad7ef9c51cfda6a156b3cdf86b631.zip | |
mac80211: IBSS: avoid unneeded return value processing
when ieee80211_ibss_csa_beacon() fails, we return it's value.
When it succeeds, we basically copy it's value and also .. return it.
Just return it immediately, simplifying the code.
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Link: https://lore.kernel.org/r/20190911141431.12498-1-koen.vandeputte@ncentric.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/ibss.c')
| -rw-r--r-- | net/mac80211/ibss.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index 0a6ff01c68a9..d40744903fa9 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c @@ -538,7 +538,6 @@ int ieee80211_ibss_finish_csa(struct ieee80211_sub_if_data *sdata) { struct ieee80211_if_ibss *ifibss = &sdata->u.ibss; struct cfg80211_bss *cbss; - int err, changed = 0; sdata_assert_lock(sdata); @@ -560,13 +559,7 @@ int ieee80211_ibss_finish_csa(struct ieee80211_sub_if_data *sdata) ifibss->chandef = sdata->csa_chandef; /* generate the beacon */ - err = ieee80211_ibss_csa_beacon(sdata, NULL); - if (err < 0) - return err; - - changed |= err; - - return changed; + return ieee80211_ibss_csa_beacon(sdata, NULL); } void ieee80211_ibss_stop(struct ieee80211_sub_if_data *sdata) |