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

mac80211: use nl80211 interface types

Browse Source 
There's really no reason for mac80211 to be using its
own interface type defines. Use the nl80211 types and
simplify the configuration code a bit: there's no need
to translate them any more now.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Johannes Berg
2008-09-11 00:01:58 +02:00
committed by John W. Linville
parent 96dd22ac06
commit 05c914fe33
53 changed files with 517 additions and 551 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/mac80211/key.c
View File

@@ -118,8 +118,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->vif.type == IEEE80211_IF_TYPE_AP ||
key->sdata->vif.type == IEEE80211_IF_TYPE_VLAN))
(key->sdata->vif.type == NL80211_IFTYPE_AP ||
key->sdata->vif.type == NL80211_IFTYPE_AP_VLAN))
addr = zero_addr;
if (key->sta)
@@ -331,7 +331,7 @@ void ieee80211_key_link(struct ieee80211_key *key,
*/
key->conf.flags |= IEEE80211_KEY_FLAG_PAIRWISE;
} else {
if (sdata->vif.type == IEEE80211_IF_TYPE_STA) {
if (sdata->vif.type == NL80211_IFTYPE_STATION) {
struct sta_info *ap;
/*