lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mac80211: move interface type to vif structure

Browse Source 
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>
This commit is contained in:
Johannes Berg
2007-12-19 01:31:27 +01:00
committed by David S. Miller
parent 32bfd35d4b
commit 51fb61e76d
13 changed files with 118 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/mac80211/key.c
View File

@@ -49,8 +49,8 @@ static const u8 *get_mac_for_key(struct ieee80211_key *key)
* address to indicate a transmit-only key.
*/
if (key->conf.alg != ALG_WEP &&
(key->sdata->type == IEEE80211_IF_TYPE_AP ||
key->sdata->type == IEEE80211_IF_TYPE_VLAN))
(key->sdata->vif.type == IEEE80211_IF_TYPE_AP ||
key->sdata->vif.type == IEEE80211_IF_TYPE_VLAN))
addr = zero_addr;
if (key->sta)
@@ -172,7 +172,7 @@ struct ieee80211_key *ieee80211_key_alloc(struct ieee80211_sub_if_data *sdata,
if (sta->flags & WLAN_STA_WME)
key->conf.flags |= IEEE80211_KEY_FLAG_WMM_STA;
} else {
if (sdata->type == IEEE80211_IF_TYPE_STA) {
if (sdata->vif.type == IEEE80211_IF_TYPE_STA) {
struct sta_info *ap;
/* same here, the AP could be using QoS */