dect/linux-2.6
Archived
14
0
Fork 0
Code Releases Activity

[MAC80211]: kill key_mgmt, use key_management_enabled

Browse source 
The key_mgmt variable for STA interfaces doesn't seem well-defined
nor do we actually use the values other than "NONE", so change it to
be named better.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Acked-by: Michael Wu <flamingice@sourmilk.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Johannes Berg 2007-08-28 17:01:53 -04:00 committed by David S. Miller
parent 7b33a57f0f
commit 808718c147
4 changed files with 7 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
net/mac80211/hostapd_ioctl.h
View file

@ -41,14 +41,6 @@ enum {
PRISM2_PARAM_MIXED_CELL = 1039,
};
enum {
IEEE80211_KEY_MGMT_NONE = 0,
IEEE80211_KEY_MGMT_IEEE8021X = 1,
IEEE80211_KEY_MGMT_WPA_PSK = 2,
IEEE80211_KEY_MGMT_WPA_EAP = 3,
};
/* Data structures used for get_hw_features ioctl */
struct hostapd_ioctl_hw_modes_hdr {
int mode;

2
net/mac80211/ieee80211_i.h
View file

@ -253,7 +253,7 @@ struct ieee80211_if_sta {
unsigned long request;
struct sk_buff_head skb_queue;
int key_mgmt;
int key_management_enabled;
unsigned long last_probe;
#define IEEE80211_AUTH_ALG_OPEN BIT(0)

20
net/mac80211/ieee80211_ioctl.c
View file

@ -1342,22 +1342,12 @@ static int ieee80211_ioctl_siwauth(struct net_device *dev,
ret = -EINVAL;
else {
/*
* TODO: sdata->u.sta.key_mgmt does not match with WE18
* value completely; could consider modifying this to
* be closer to WE18. For now, this value is not really
* used for anything else than Privacy matching, so the
* current code here should be more or less OK.
* Key management was set by wpa_supplicant,
* we only need this to associate to a network
* that has privacy enabled regardless of not
* having a key.
*/
if (data->value & IW_AUTH_KEY_MGMT_802_1X) {
sdata->u.sta.key_mgmt =
IEEE80211_KEY_MGMT_WPA_EAP;
} else if (data->value & IW_AUTH_KEY_MGMT_PSK) {
sdata->u.sta.key_mgmt =
IEEE80211_KEY_MGMT_WPA_PSK;
} else {
sdata->u.sta.key_mgmt =
IEEE80211_KEY_MGMT_NONE;
}
sdata->u.sta.key_management_enabled = !!data->value;
}
break;
case IW_AUTH_80211_AUTH_ALG:

3
net/mac80211/ieee80211_sta.c
View file

@ -716,8 +716,7 @@ static int ieee80211_privacy_mismatch(struct net_device *dev,
struct ieee80211_sta_bss *bss;
int res = 0;
if (!ifsta || ifsta->mixed_cell ||
ifsta->key_mgmt != IEEE80211_KEY_MGMT_NONE)
if (!ifsta || ifsta->mixed_cell || ifsta->key_management_enabled)
return 0;
bss = ieee80211_rx_bss_get(dev, ifsta->bssid);