2021-05-19 05:38:47

by Johannes Berg

[permalink] [raw]
Subject: [PATCH 4/4] mac80211: simplify ieee80211_add_station()

From: Johannes Berg <[email protected]>

There's no need to do some kind of weird err and RCU dance
just use sta_info_insert() directly.

Signed-off-by: Johannes Berg <[email protected]>
---
net/mac80211/cfg.c | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 7a99892e5aba..0d29a9d1f910 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1693,15 +1693,7 @@ static int ieee80211_add_station(struct wiphy *wiphy, struct net_device *dev,
test_sta_flag(sta, WLAN_STA_ASSOC))
rate_control_rate_init(sta);

- err = sta_info_insert_rcu(sta);
- if (err) {
- rcu_read_unlock();
- return err;
- }
-
- rcu_read_unlock();
-
- return 0;
+ return sta_info_insert(sta);
}

static int ieee80211_del_station(struct wiphy *wiphy, struct net_device *dev,
--
2.31.1