Commit 655914ab authored by Johannes Berg's avatar Johannes Berg

mac80211: use just spin_lock() in ieee80211_get_tkip_p2k()

ieee80211_get_tkip_p2k() may be called with interrupts
disabled, so spin_unlock_bh() isn't safe and leads to
warnings. Since it's always called with BHs disabled
already, just use spin_lock().

Reported-by: default avatarMilan Kocian <>
Acked-by: default avatarStanislaw Gruszka <>
Signed-off-by: default avatarJohannes Berg <>
parent f6b3d85f
...@@ -208,10 +208,10 @@ void ieee80211_get_tkip_p2k(struct ieee80211_key_conf *keyconf, ...@@ -208,10 +208,10 @@ void ieee80211_get_tkip_p2k(struct ieee80211_key_conf *keyconf,
u32 iv32 = get_unaligned_le32(&data[4]); u32 iv32 = get_unaligned_le32(&data[4]);
u16 iv16 = data[2] | (data[0] << 8); u16 iv16 = data[2] | (data[0] << 8);
spin_lock_bh(&key->u.tkip.txlock); spin_lock(&key->u.tkip.txlock);
ieee80211_compute_tkip_p1k(key, iv32); ieee80211_compute_tkip_p1k(key, iv32);
tkip_mixing_phase2(tk, ctx, iv16, p2k); tkip_mixing_phase2(tk, ctx, iv16, p2k);
spin_unlock_bh(&key->u.tkip.txlock); spin_unlock(&key->u.tkip.txlock);
} }
EXPORT_SYMBOL(ieee80211_get_tkip_p2k); EXPORT_SYMBOL(ieee80211_get_tkip_p2k);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment