summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJouni Malinen <jkmaline@cc.hut.fi>2006-03-24 21:24:55 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2006-04-07 09:44:30 -0700
commit1cce602f07cbc7e9f543cc5c4c98da011a671e03 (patch)
tree5a6f8ee5ddc388af9d1e8f447bd6edde6b84f2bc
parent798e8df74101880b40a57acebb3e95b83ed9222f (diff)
downloadlwn-1cce602f07cbc7e9f543cc5c4c98da011a671e03.tar.gz
lwn-1cce602f07cbc7e9f543cc5c4c98da011a671e03.zip
[PATCH] hostap: Fix EAPOL frame encryption
Fixed encrypted of EAPOL frames from wlan#ap interface (hostapd). This was broken when moving to use new frame control field defines in net/ieee80211.h. hostapd uses Protected flag, not protocol version (which was cleared in this function anyway). This fixes WPA group key handshake and re-authentication. http://hostap.epitest.fi/bugz/show_bug.cgi?id=126 Signed-off-by: Jouni Malinen <jkmaline@cc.hut.fi>
-rw-r--r--drivers/net/wireless/hostap/hostap_80211_tx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/hostap/hostap_80211_tx.c b/drivers/net/wireless/hostap/hostap_80211_tx.c
index 4a85e63906f1..5f398bd8344d 100644
--- a/drivers/net/wireless/hostap/hostap_80211_tx.c
+++ b/drivers/net/wireless/hostap/hostap_80211_tx.c
@@ -469,7 +469,7 @@ int hostap_master_start_xmit(struct sk_buff *skb, struct net_device *dev)
}
if (local->ieee_802_1x && meta->ethertype == ETH_P_PAE && tx.crypt &&
- !(fc & IEEE80211_FCTL_VERS)) {
+ !(fc & IEEE80211_FCTL_PROTECTED)) {
no_encrypt = 1;
PDEBUG(DEBUG_EXTRA2, "%s: TX: IEEE 802.1X - passing "
"unencrypted EAPOL frame\n", dev->name);