1 files changed, 7 insertions, 5 deletions

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 50ab4b2de1e9..12c15588af68 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -420,7 +420,6 @@ ieee80211_tx_h_unicast_ps_buf(struct ieee80211_txrx_data *tx)
         return TXRX_CONTINUE;
 }
 
-
 static ieee80211_txrx_result
 ieee80211_tx_h_ps_buf(struct ieee80211_txrx_data *tx)
 {
@@ -433,13 +432,15 @@ ieee80211_tx_h_ps_buf(struct ieee80211_txrx_data *tx)
                 return ieee80211_tx_h_multicast_ps_buf(tx);
 }
 
-
-
-
 static ieee80211_txrx_result
 ieee80211_tx_h_select_key(struct ieee80211_txrx_data *tx)
 {
         struct ieee80211_key *key;
+        const struct ieee80211_hdr *hdr;
+        u16 fc;
+
+        hdr = (const struct ieee80211_hdr *) tx->skb->data;
+        fc = le16_to_cpu(hdr->frame_control);
 
         if (unlikely(tx->u.tx.control->flags & IEEE80211_TXCTL_DO_NOT_ENCRYPT))
                 tx->key = NULL;
@@ -448,7 +449,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 &&
-                 !(tx->sdata->eapol && ieee80211_is_eapol(tx->skb))) {
+                 !(tx->sdata->eapol &&
+                   ieee80211_is_eapol(tx->skb, ieee80211_get_hdrlen(fc)))) {
                 I802_DEBUG_INC(tx->local->tx_handlers_drop_unencrypted);
                 return TXRX_DROP;
         } else {