4 files changed, 9 insertions, 19 deletions

diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c
index c0dbf77547f7..9c14e3d303c5 100644
--- a/net/mac80211/ieee80211.c
+++ b/net/mac80211/ieee80211.c
@@ -732,6 +732,8 @@ static void ieee80211_remove_tx_extra(struct ieee80211_local *local,
                 pkt_data->flags |= IEEE80211_TXPD_DO_NOT_ENCRYPT;
         if (control->flags & IEEE80211_TXCTL_REQUEUE)
                 pkt_data->flags |= IEEE80211_TXPD_REQUEUE;
+        if (control->flags & IEEE80211_TXCTL_EAPOL_FRAME)
+                pkt_data->flags |= IEEE80211_TXPD_EAPOL_FRAME;
         pkt_data->queue = control->queue;
 
         hdrlen = ieee80211_get_hdrlen_from_skb(skb);
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 214109b8d95a..baf53c047127 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -164,6 +164,7 @@ struct ieee80211_txrx_data {
 #define IEEE80211_TXPD_REQ_TX_STATUS    BIT(0)
 #define IEEE80211_TXPD_DO_NOT_ENCRYPT   BIT(1)
 #define IEEE80211_TXPD_REQUEUE          BIT(2)
+#define IEEE80211_TXPD_EAPOL_FRAME      BIT(3)
 /* Stored in sk_buff->cb */
 struct ieee80211_tx_packet_data {
         int ifindex;
@@ -798,7 +799,6 @@ extern void *mac80211_wiphy_privid; /* for wiphy privid */
 extern const unsigned char rfc1042_header[6];
 extern const unsigned char bridge_tunnel_header[6];
 u8 *ieee80211_get_bssid(struct ieee80211_hdr *hdr, size_t len);
-int ieee80211_is_eapol(const struct sk_buff *skb, int hdrlen);
 int ieee80211_frame_duration(struct ieee80211_local *local, size_t len,
                              int rate, int erp, int short_preamble);
 void mac80211_ev_michael_mic_failure(struct net_device *dev, int keyidx,
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 6dbd91842881..e177a8dc23b9 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -437,7 +437,8 @@ ieee80211_tx_h_select_key(struct ieee80211_txrx_data *tx)
         else if ((key = rcu_dereference(tx->sdata->default_key)))
                 tx->key = key;
         else if (tx->sdata->drop_unencrypted &&
-                 !ieee80211_is_eapol(tx->skb, ieee80211_get_hdrlen(fc))) {
+                 !(tx->u.tx.control->flags & IEEE80211_TXCTL_EAPOL_FRAME) &&
+                 !(tx->flags & IEEE80211_TXRXD_TX_INJECTED)) {
                 I802_DEBUG_INC(tx->local->tx_handlers_drop_unencrypted);
                 return TXRX_DROP;
         } else {
@@ -1241,6 +1242,8 @@ int ieee80211_master_start_xmit(struct sk_buff *skb,
                 control.flags |= IEEE80211_TXCTL_DO_NOT_ENCRYPT;
         if (pkt_data->flags & IEEE80211_TXPD_REQUEUE)
                 control.flags |= IEEE80211_TXCTL_REQUEUE;
+        if (pkt_data->flags & IEEE80211_TXPD_EAPOL_FRAME)
+                control.flags |= IEEE80211_TXCTL_EAPOL_FRAME;
         control.queue = pkt_data->queue;
 
         ret = ieee80211_tx(odev, skb, &control);
@@ -1514,6 +1517,8 @@ int ieee80211_subif_start_xmit(struct sk_buff *skb,
         pkt_data = (struct ieee80211_tx_packet_data *)skb->cb;
         memset(pkt_data, 0, sizeof(struct ieee80211_tx_packet_data));
         pkt_data->ifindex = dev->ifindex;
+        if (ethertype == ETH_P_PAE)
+                pkt_data->flags |= IEEE80211_TXPD_EAPOL_FRAME;
 
         skb->dev = local->mdev;
         dev->stats.tx_packets++;
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index fb7fd896cd0d..2b02b2b9d645 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -40,10 +40,6 @@ const unsigned char rfc1042_header[] =
 const unsigned char bridge_tunnel_header[] =
         { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8 };
 
-/* No encapsulation header if EtherType < 0x600 (=length) */
-static const unsigned char eapol_header[] =
-        { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00, 0x88, 0x8e };
-
 
 static int rate_list_match(const int *rate_list, int rate)
 {
@@ -223,19 +219,6 @@ int ieee80211_get_hdrlen_from_skb(const struct sk_buff *skb)
 }
 EXPORT_SYMBOL(ieee80211_get_hdrlen_from_skb);
 
-int ieee80211_is_eapol(const struct sk_buff *skb, int hdrlen)
-{
-        if (unlikely(skb->len < 10))
-                return 0;
-
-        if (unlikely(skb->len >= hdrlen + sizeof(eapol_header) &&
-                     memcmp(skb->data + hdrlen, eapol_header,
-                            sizeof(eapol_header)) == 0))
-                return 1;
-
-        return 0;
-}
-
 void ieee80211_tx_set_iswep(struct ieee80211_txrx_data *tx)
 {
         struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) tx->skb->data;