Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[~andy/linux] / net / mac80211 / wpa.c

diff --git a/net/mac80211/wpa.c b/net/mac80211/wpa.c
index c175ee866ff4ab8eb70b72a6b281ddcffc591ff1..c7c6d644486fc48354c332483db73b2454d781a5 100644 (file)
--- a/net/mac80211/wpa.c
+++ b/net/mac80211/wpa.c
@@ -181,7 +181,6 @@ static int tkip_encrypt_skb(struct ieee80211_tx_data *tx, struct sk_buff *skb)
        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
        struct ieee80211_key *key = tx->key;
        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
-       unsigned long flags;
        unsigned int hdrlen;
        int len, tail;
        u8 *pos;
@@ -216,12 +215,12 @@ static int tkip_encrypt_skb(struct ieee80211_tx_data *tx, struct sk_buff *skb)
                return 0;
 
        /* Increase IV for the frame */
-       spin_lock_irqsave(&key->u.tkip.txlock, flags);
+       spin_lock(&key->u.tkip.txlock);
        key->u.tkip.tx.iv16++;
        if (key->u.tkip.tx.iv16 == 0)
                key->u.tkip.tx.iv32++;
        pos = ieee80211_tkip_add_iv(pos, key);
-       spin_unlock_irqrestore(&key->u.tkip.txlock, flags);
+       spin_unlock(&key->u.tkip.txlock);
 
        /* hwaccel - with software IV */
        if (info->control.hw_key)