summaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2011-06-28 13:53:32 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-06-28 13:56:21 -0400
commit3be3fdb58ad22f67c5fd12548c88cefe3f726588 (patch)
tree0c5c4e509c37098671df55a20b7e9aadb3d74db8 /net/wireless
parent77b7023afe93b5e3bdcf2c0faaa5e5caafb6ef44 (diff)
parent5ee0a58d8ca443e80ed8712c86c9938360b79cac (diff)
downloadlinux-3be3fdb58ad22f67c5fd12548c88cefe3f726588.tar.bz2
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts: drivers/net/wireless/iwlwifi/iwl-tx.c
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/nl80211.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index aed6d2ad4c90..50ff82aa4890 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -6566,7 +6566,8 @@ void nl80211_michael_mic_failure(struct cfg80211_registered_device *rdev,
if (addr)
NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, addr);
NLA_PUT_U32(msg, NL80211_ATTR_KEY_TYPE, key_type);
- NLA_PUT_U8(msg, NL80211_ATTR_KEY_IDX, key_id);
+ if (key_id != -1)
+ NLA_PUT_U8(msg, NL80211_ATTR_KEY_IDX, key_id);
if (tsc)
NLA_PUT(msg, NL80211_ATTR_KEY_SEQ, 6, tsc);