Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03395003 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: use spin_lock_bh() for TKIP lock 



Since no driver calls the TKIP functions from interrupt
context, there's no need to use spin_lock_irqsave().
Just use spin_lock_bh() (and spin_lock() in the TX path
where we're in a BH or they're already disabled.)

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 65f704a5

net/mac80211/tkip.c

+4 −6
Original line number Diff line number Diff line
@@ -177,12 +177,11 @@ void ieee80211_get_tkip_p1k_iv(struct ieee80211_key_conf *keyconf, 
	struct ieee80211_key *key = (struct ieee80211_key *)

			container_of(keyconf, struct ieee80211_key, conf);

	struct tkip_ctx *ctx = &key->u.tkip.tx;

	unsigned long flags;



	spin_lock_irqsave(&key->u.tkip.txlock, flags);

	spin_lock_bh(&key->u.tkip.txlock);

	ieee80211_compute_tkip_p1k(key, iv32);

	memcpy(p1k, ctx->p1k, sizeof(ctx->p1k));

	spin_unlock_irqrestore(&key->u.tkip.txlock, flags);

	spin_unlock_bh(&key->u.tkip.txlock);

}

EXPORT_SYMBOL(ieee80211_get_tkip_p1k_iv);
@@ -208,12 +207,11 @@ void ieee80211_get_tkip_p2k(struct ieee80211_key_conf *keyconf, 
	const u8 *data = (u8 *)hdr + ieee80211_hdrlen(hdr->frame_control);

	u32 iv32 = get_unaligned_le32(&data[4]);

	u16 iv16 = data[2] | (data[0] << 8);

	unsigned long flags;



	spin_lock_irqsave(&key->u.tkip.txlock, flags);

	spin_lock_bh(&key->u.tkip.txlock);

	ieee80211_compute_tkip_p1k(key, iv32);

	tkip_mixing_phase2(tk, ctx, iv16, p2k);

	spin_unlock_irqrestore(&key->u.tkip.txlock, flags);

	spin_unlock_bh(&key->u.tkip.txlock);

}

EXPORT_SYMBOL(ieee80211_get_tkip_p2k);

net/mac80211/wpa.c

+2 −3
Original line number Diff line number Diff line
@@ -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)