Merge refs/heads/ieee80211-wifi from master.kernel.org:/pub/scm/linux/kernel/git...

[linux-2.6] / net / ieee80211 / ieee80211_tx.c

diff --git a/net/ieee80211/ieee80211_tx.c b/net/ieee80211/ieee80211_tx.c
index 308fcd9ab1e3f21b988609a01bc813eb0d939760..b7ea3e25e25d794bacb633563b8ca4b75c6a6595 100644 (file)
--- a/net/ieee80211/ieee80211_tx.c
+++ b/net/ieee80211/ieee80211_tx.c
@@ -33,7 +33,6 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/netdevice.h>
-#include <linux/pci.h>
 #include <linux/proc_fs.h>
 #include <linux/skbuff.h>
 #include <linux/slab.h>
@@ -212,8 +211,8 @@ void ieee80211_txb_free(struct ieee80211_txb *txb) {
        kfree(txb);
 }
 
-struct ieee80211_txb *ieee80211_alloc_txb(int nr_frags, int txb_size,
-                                         int gfp_mask)
+static struct ieee80211_txb *ieee80211_alloc_txb(int nr_frags, int txb_size,
+                                                int gfp_mask)
 {
        struct ieee80211_txb *txb;
        int i;
@@ -293,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);
@@ -314,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;