2.6.25-rc7

 net

 mac80211

diff --git a/net/mac80211/wpa.c b/net/mac80211/wpa.c
index 20cec1c..6f04311 100644
--- a/net/mac80211/wpa.c
+++ b/net/mac80211/wpa.c
@@ -245,16 +245,9 @@ static int tkip_encrypt_skb(struct ieee80211_txrx_data *tx,
 ieee80211_txrx_result
 ieee80211_crypto_tkip_encrypt(struct ieee80211_txrx_data *tx)
 {
-   struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) tx->skb->data;
-   u16 fc;
    struct sk_buff *skb = tx->skb;
    int wpa_test = 0, test = 0;
 
-   fc = le16_to_cpu(hdr->frame_control);
-
-   if (!WLAN_FC_DATA_PRESENT(fc))
-      return TXRX_CONTINUE;
-
    tx->u.tx.control->icv_len = TKIP_ICV_LEN;
    tx->u.tx.control->iv_len = TKIP_IV_LEN;
    ieee80211_tx_set_iswep(tx);
@@ -501,16 +494,9 @@ static int ccmp_encrypt_skb(struct ieee80211_txrx_data *tx,
 ieee80211_txrx_result
 ieee80211_crypto_ccmp_encrypt(struct ieee80211_txrx_data *tx)
 {
-   struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) tx->skb->data;
-   u16 fc;
    struct sk_buff *skb = tx->skb;
    int test = 0;
 
-   fc = le16_to_cpu(hdr->frame_control);
-
-   if (!WLAN_FC_DATA_PRESENT(fc))
-      return TXRX_CONTINUE;
-
    tx->u.tx.control->icv_len = CCMP_MIC_LEN;
    tx->u.tx.control->iv_len = CCMP_HDR_LEN;
    ieee80211_tx_set_iswep(tx);