From: Johannes Berg <johannes.berg@xxxxxxxxx>
Instead of maintaining separate sta_add/sta_remove
callsites, implement it in sta_state when the driver
has no sta_state implementation.
The only behavioural change this should cause is in
secure mesh mode: with this the station entries will
only be created after the stations are set to AUTH.
Given which drivers support mesh, this seems to not
be a problem.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
---
net/mac80211/driver-ops.h | 11 ++++++++++-
net/mac80211/pm.c | 2 --
net/mac80211/sta_info.c | 23 +++++++++--------------
net/mac80211/util.c | 2 --
4 files changed, 19 insertions(+), 19 deletions(-)
--- a/net/mac80211/sta_info.c 2012-01-20 13:54:19.000000000 +0100
+++ b/net/mac80211/sta_info.c 2012-01-20 13:54:20.000000000 +0100
@@ -365,7 +365,12 @@ static int sta_info_insert_drv_state(str
}
if (!err) {
- sta->uploaded = true;
+ /*
+ * Drivers using legacy sta_add/sta_remove callbacks only
+ * get uploaded set to true after sta_add is called.
+ */
+ if (!local->ops->sta_add)
+ sta->uploaded = true;
return 0;
}
@@ -417,18 +422,9 @@ static int sta_info_insert_finish(struct
if (!sta->dummy || dummy_reinsert) {
/* notify driver */
- err = drv_sta_add(local, sdata, &sta->sta);
- if (err) {
- if (sdata->vif.type != NL80211_IFTYPE_ADHOC)
- goto out_err;
- printk(KERN_DEBUG "%s: failed to add IBSS STA %pM to "
- "driver (%d) - keeping it anyway.\n",
- sdata->name, sta->sta.addr, err);
- } else {
- err = sta_info_insert_drv_state(local, sdata, sta);
- if (err)
- goto out_err;
- }
+ err = sta_info_insert_drv_state(local, sdata, sta);
+ if (err)
+ goto out_err;
}
if (!dummy_reinsert) {
@@ -813,7 +809,6 @@ int __must_check __sta_info_destroy(stru
}
if (sta->uploaded) {
- drv_sta_remove(local, sdata, &sta->sta);
ret = drv_sta_state(local, sdata, sta, IEEE80211_STA_NONE,
IEEE80211_STA_NOTEXIST);
WARN_ON_ONCE(ret != 0);
--- a/net/mac80211/util.c 2012-01-20 13:54:19.000000000 +0100
+++ b/net/mac80211/util.c 2012-01-20 13:54:20.000000000 +0100
@@ -1187,8 +1187,6 @@ int ieee80211_reconfig(struct ieee80211_
if (sta->uploaded) {
enum ieee80211_sta_state state;
- WARN_ON(drv_sta_add(local, sta->sdata, &sta->sta));
-
for (state = IEEE80211_STA_NOTEXIST;
state < sta->sta_state - 1; state++)
WARN_ON(drv_sta_state(local, sta->sdata, sta,
--- a/net/mac80211/pm.c 2012-01-20 13:54:19.000000000 +0100
+++ b/net/mac80211/pm.c 2012-01-20 13:54:20.000000000 +0100
@@ -100,8 +100,6 @@ int __ieee80211_suspend(struct ieee80211
if (sta->uploaded) {
enum ieee80211_sta_state state;
- drv_sta_remove(local, sta->sdata, &sta->sta);
-
state = sta->sta_state;
for (; state > IEEE80211_STA_NOTEXIST; state--)
WARN_ON(drv_sta_state(local, sdata, sta,
--- a/net/mac80211/driver-ops.h 2012-01-20 13:54:19.000000000 +0100
+++ b/net/mac80211/driver-ops.h 2012-01-20 13:54:20.000000000 +0100
@@ -493,9 +493,18 @@ int drv_sta_state(struct ieee80211_local
check_sdata_in_driver(sdata);
trace_drv_sta_state(local, sdata, &sta->sta, old_state, new_state);
- if (local->ops->sta_state)
+ if (local->ops->sta_state) {
ret = local->ops->sta_state(&local->hw, &sdata->vif, &sta->sta,
old_state, new_state);
+ } else if (old_state == IEEE80211_STA_AUTH &&
+ new_state == IEEE80211_STA_ASSOC) {
+ ret = drv_sta_add(local, sdata, &sta->sta);
+ if (ret == 0)
+ sta->uploaded = true;
+ } else if (old_state == IEEE80211_STA_ASSOC &&
+ new_state == IEEE80211_STA_AUTH) {
+ drv_sta_remove(local, sdata, &sta->sta);
+ }
trace_drv_return_int(local, ret);
return ret;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
