aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/key.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2007-12-18 19:31:27 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:09:37 -0500
commit51fb61e76d952e6bc2fbdd9f0d38425fbab1cf31 (patch)
tree09618b395aae1b91fbc8dec7ea9397a9654a9f0f /net/mac80211/key.c
parent32bfd35d4b63bd63de4bb0d791ef049c3c868726 (diff)
mac80211: move interface type to vif structure
Drivers that support mixed AP/STA operation may well need to know the type of a virtual interface when iterating over them. The easiest way to support that is to move the interface type variable into the vif structure. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/key.c')
-rw-r--r--net/mac80211/key.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/mac80211/key.c b/net/mac80211/key.c
index 0b2328f7d67c..ed57fb8e82fc 100644
--- a/net/mac80211/key.c
+++ b/net/mac80211/key.c
@@ -49,8 +49,8 @@ static const u8 *get_mac_for_key(struct ieee80211_key *key)
49 * address to indicate a transmit-only key. 49 * address to indicate a transmit-only key.
50 */ 50 */
51 if (key->conf.alg != ALG_WEP && 51 if (key->conf.alg != ALG_WEP &&
52 (key->sdata->type == IEEE80211_IF_TYPE_AP || 52 (key->sdata->vif.type == IEEE80211_IF_TYPE_AP ||
53 key->sdata->type == IEEE80211_IF_TYPE_VLAN)) 53 key->sdata->vif.type == IEEE80211_IF_TYPE_VLAN))
54 addr = zero_addr; 54 addr = zero_addr;
55 55
56 if (key->sta) 56 if (key->sta)
@@ -172,7 +172,7 @@ struct ieee80211_key *ieee80211_key_alloc(struct ieee80211_sub_if_data *sdata,
172 if (sta->flags & WLAN_STA_WME) 172 if (sta->flags & WLAN_STA_WME)
173 key->conf.flags |= IEEE80211_KEY_FLAG_WMM_STA; 173 key->conf.flags |= IEEE80211_KEY_FLAG_WMM_STA;
174 } else { 174 } else {
175 if (sdata->type == IEEE80211_IF_TYPE_STA) { 175 if (sdata->vif.type == IEEE80211_IF_TYPE_STA) {
176 struct sta_info *ap; 176 struct sta_info *ap;
177 177
178 /* same here, the AP could be using QoS */ 178 /* same here, the AP could be using QoS */