diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2007-08-28 17:01:53 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:48:46 -0400 |
commit | 808718c1477b8350e9e329bf4a35391ac7c7f982 (patch) | |
tree | 93135c52721f77eafdeeeed234b5351f9be6d2d5 /net/mac80211/ieee80211_sta.c | |
parent | 7b33a57f0f5ed9fcc87f98ff5f6aa54291bd0558 (diff) |
[MAC80211]: kill key_mgmt, use key_management_enabled
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>
Diffstat (limited to 'net/mac80211/ieee80211_sta.c')
-rw-r--r-- | net/mac80211/ieee80211_sta.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c index f43c39f11223..1b3304454356 100644 --- a/net/mac80211/ieee80211_sta.c +++ b/net/mac80211/ieee80211_sta.c | |||
@@ -716,8 +716,7 @@ static int ieee80211_privacy_mismatch(struct net_device *dev, | |||
716 | struct ieee80211_sta_bss *bss; | 716 | struct ieee80211_sta_bss *bss; |
717 | int res = 0; | 717 | int res = 0; |
718 | 718 | ||
719 | if (!ifsta || ifsta->mixed_cell || | 719 | if (!ifsta || ifsta->mixed_cell || ifsta->key_management_enabled) |
720 | ifsta->key_mgmt != IEEE80211_KEY_MGMT_NONE) | ||
721 | return 0; | 720 | return 0; |
722 | 721 | ||
723 | bss = ieee80211_rx_bss_get(dev, ifsta->bssid); | 722 | bss = ieee80211_rx_bss_get(dev, ifsta->bssid); |