From: Johannes Berg <johannes@sipsolutions.net>
To: John Linville <linville@tuxdriver.com>
Cc: linux-wireless@vger.kernel.org
Subject: [PATCH 02/11] mac80211: simplify AP_VLAN handling
Date: Fri, 20 Jan 2012 13:55:18 +0100 [thread overview]
Message-ID: <20120120125740.457691596@sipsolutions.net> (raw)
In-Reply-To: 20120120125516.000124996@sipsolutions.net
From: Johannes Berg <johannes.berg@intel.com>
Setting keys and updating TKIP keys must use the
BSS sdata (not AP_VLAN), so we translate. Move
the translation into driver-ops wrappers instead
of having it inline in the code to simplify the
normal code flow.
The same can be done for sta_add/remove which
already does the translation in the wrapper.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
net/mac80211/driver-ops.h | 2 ++
net/mac80211/key.c | 8 --------
net/mac80211/pm.c | 11 ++---------
net/mac80211/sta_info.c | 8 +-------
net/mac80211/util.c | 11 ++---------
5 files changed, 7 insertions(+), 33 deletions(-)
--- a/net/mac80211/driver-ops.h 2012-01-20 13:54:10.000000000 +0100
+++ b/net/mac80211/driver-ops.h 2012-01-20 13:54:19.000000000 +0100
@@ -253,6 +253,7 @@ static inline int drv_set_key(struct iee
might_sleep();
+ sdata = get_bss_sdata(sdata);
check_sdata_in_driver(sdata);
trace_drv_set_key(local, cmd, sdata, sta, key);
@@ -272,6 +273,7 @@ static inline void drv_update_tkip_key(s
if (sta)
ista = &sta->sta;
+ sdata = get_bss_sdata(sdata);
check_sdata_in_driver(sdata);
trace_drv_update_tkip_key(local, sdata, conf, ista, iv32);
--- a/net/mac80211/key.c 2012-01-20 13:54:10.000000000 +0100
+++ b/net/mac80211/key.c 2012-01-20 13:54:19.000000000 +0100
@@ -123,9 +123,6 @@ static int ieee80211_key_enable_hw_accel
*/
if (!(key->conf.flags & IEEE80211_KEY_FLAG_PAIRWISE))
goto out_unsupported;
- sdata = container_of(sdata->bss,
- struct ieee80211_sub_if_data,
- u.ap);
}
ret = drv_set_key(key->local, SET_KEY, sdata, sta, &key->conf);
@@ -187,11 +184,6 @@ static void ieee80211_key_disable_hw_acc
(key->conf.flags & IEEE80211_KEY_FLAG_PUT_IV_SPACE)))
increment_tailroom_need_count(sdata);
- if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
- sdata = container_of(sdata->bss,
- struct ieee80211_sub_if_data,
- u.ap);
-
ret = drv_set_key(key->local, DISABLE_KEY, sdata,
sta, &key->conf);
--- a/net/mac80211/pm.c 2012-01-20 13:54:10.000000000 +0100
+++ b/net/mac80211/pm.c 2012-01-20 13:54:19.000000000 +0100
@@ -97,15 +97,8 @@ int __ieee80211_suspend(struct ieee80211
/* tear down aggregation sessions and remove STAs */
mutex_lock(&local->sta_mtx);
list_for_each_entry(sta, &local->sta_list, list) {
- if (sta->uploaded) {
- sdata = sta->sdata;
- if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
- sdata = container_of(sdata->bss,
- struct ieee80211_sub_if_data,
- u.ap);
-
- drv_sta_remove(local, sdata, &sta->sta);
- }
+ if (sta->uploaded)
+ drv_sta_remove(local, sta->sdata, &sta->sta);
mesh_plink_quiesce(sta);
}
--- a/net/mac80211/sta_info.c 2012-01-20 13:54:17.000000000 +0100
+++ b/net/mac80211/sta_info.c 2012-01-20 13:54:19.000000000 +0100
@@ -775,14 +775,8 @@ int __must_check __sta_info_destroy(stru
}
}
- if (sta->uploaded) {
- if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
- sdata = container_of(sdata->bss,
- struct ieee80211_sub_if_data,
- u.ap);
+ if (sta->uploaded)
drv_sta_remove(local, sdata, &sta->sta);
- sdata = sta->sdata;
- }
/*
* At this point, after we wait for an RCU grace period,
--- a/net/mac80211/util.c 2012-01-20 13:54:17.000000000 +0100
+++ b/net/mac80211/util.c 2012-01-20 13:54:19.000000000 +0100
@@ -1184,15 +1184,8 @@ int ieee80211_reconfig(struct ieee80211_
/* add STAs back */
mutex_lock(&local->sta_mtx);
list_for_each_entry(sta, &local->sta_list, list) {
- if (sta->uploaded) {
- sdata = sta->sdata;
- if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
- sdata = container_of(sdata->bss,
- struct ieee80211_sub_if_data,
- u.ap);
-
- WARN_ON(drv_sta_add(local, sdata, &sta->sta));
- }
+ if (sta->uploaded)
+ WARN_ON(drv_sta_add(local, sta->sdata, &sta->sta));
}
mutex_unlock(&local->sta_mtx);
next prev parent reply other threads:[~2012-01-20 12:58 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-20 12:55 [PATCH 00/11] station management & auth/assoc redesign Johannes Berg
2012-01-20 12:55 ` [PATCH 01/11] mac80211: move managed mode station state modification Johannes Berg
2012-01-20 12:55 ` Johannes Berg [this message]
2012-01-20 12:55 ` [PATCH 03/11] mac80211: dont program keys for stations not uploaded Johannes Berg
2012-01-20 12:55 ` [PATCH 04/11] mac80211: add NOTEXIST station state Johannes Berg
2012-01-20 12:55 ` [PATCH 06/11] mac80211: implement sta_add/sta_remove in sta_state Johannes Berg
2012-01-20 12:55 ` [PATCH 07/11] mac80211: call rate control only after init Johannes Berg
2012-01-20 12:55 ` [PATCH 08/11] mac80211: remove dummy STA support Johannes Berg
2012-01-20 12:55 ` [PATCH 09/11] cfg80211: stop tracking authenticated state Johannes Berg
2012-01-20 12:55 ` [PATCH 10/11] cfg80211: export cfg80211_ref_bss Johannes Berg
2012-01-20 12:55 ` [PATCH 11/11] mac80211: redesign auth/assoc Johannes Berg
2012-01-20 13:01 ` [PATCH 05/11 (resend for list)] mac80211: add sta_state callback Johannes Berg
2012-02-02 7:45 ` [PATCH 00/11] station management & auth/assoc redesign Eliad Peller
2012-02-02 15:13 ` Johannes Berg
2012-02-02 20:52 ` John W. Linville
2012-02-02 23:21 ` Johannes Berg
2012-02-03 6:26 ` Johannes Berg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120120125740.457691596@sipsolutions.net \
--to=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.