X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2Fieee80211%2Fieee80211_tx.c;h=b7ea3e25e25d794bacb633563b8ca4b75c6a6595;hb=5d8c397f304e1363f8ff9749b08172eb59e6534a;hp=d1049edcd14d3469f7d8f3c9310f415c7a526f82;hpb=7c9d4c70b20e165eb11d8aed2b6374377d17f43a;p=linux-2.6

diff --git a/net/ieee80211/ieee80211_tx.c b/net/ieee80211/ieee80211_tx.c
index d1049edcd1..b7ea3e25e2 100644
--- a/net/ieee80211/ieee80211_tx.c
+++ b/net/ieee80211/ieee80211_tx.c
@@ -292,15 +292,6 @@ int ieee80211_xmit(struct sk_buff *skb,
 		goto success;
 	}
 
-#ifdef CONFIG_IEEE80211_DEBUG
-	if (crypt && !encrypt && ether_type == ETH_P_PAE) {
-		struct eapol *eap = (struct eapol *)(skb->data +
-			sizeof(struct ethhdr) - SNAP_SIZE - sizeof(u16));
-		IEEE80211_DEBUG_EAP("TX: IEEE 802.11 EAPOL frame: %s\n",
-			eap_get_type(eap->type));
-	}
-#endif
-
 	/* Save source and destination addresses */
 	memcpy(&dest, skb->data, ETH_ALEN);
 	memcpy(&src, skb->data+ETH_ALEN, ETH_ALEN);
@@ -313,7 +304,7 @@ int ieee80211_xmit(struct sk_buff *skb,
 
 	if (encrypt)
 		fc = IEEE80211_FTYPE_DATA | IEEE80211_STYPE_DATA |
-			IEEE80211_FCTL_WEP;
+			IEEE80211_FCTL_PROTECTED;
 	else
 		fc = IEEE80211_FTYPE_DATA | IEEE80211_STYPE_DATA;