diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-07-13 17:02:12 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-07-13 17:02:12 +0900 |
commit | 4af358f81881e1d083a916c9269b5ac0936e180d (patch) | |
tree | c0533d3268daccb6f06f1180aa1ae8f1aac17d36 /net/mac80211/wpa.c | |
parent | 7653aaab775d4c205a7dce52850c8e3d4f31d4ea (diff) | |
parent | b63d10130e68aa6480cc1b2483d7c5ce57a05481 (diff) | |
download | linux-4af358f81881e1d083a916c9269b5ac0936e180d.tar.gz linux-4af358f81881e1d083a916c9269b5ac0936e180d.tar.bz2 linux-4af358f81881e1d083a916c9269b5ac0936e180d.zip |
Merge branch 'fbdev/stable-updates'
Diffstat (limited to 'net/mac80211/wpa.c')
-rw-r--r-- | net/mac80211/wpa.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/net/mac80211/wpa.c b/net/mac80211/wpa.c index 9dc3b5f26e80..d91c1a26630d 100644 --- a/net/mac80211/wpa.c +++ b/net/mac80211/wpa.c @@ -154,7 +154,13 @@ update_iv: return RX_CONTINUE; mic_fail: - mac80211_ev_michael_mic_failure(rx->sdata, rx->key->conf.keyidx, + /* + * In some cases the key can be unset - e.g. a multicast packet, in + * a driver that supports HW encryption. Send up the key idx only if + * the key is set. + */ + mac80211_ev_michael_mic_failure(rx->sdata, + rx->key ? rx->key->conf.keyidx : -1, (void *) skb->data, NULL, GFP_ATOMIC); return RX_DROP_UNUSABLE; } |