aboutsummaryrefslogtreecommitdiff
path: root/include
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 /include
parent77b7023afe93b5e3bdcf2c0faaa5e5caafb6ef44 (diff)
parent5ee0a58d8ca443e80ed8712c86c9938360b79cac (diff)
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 'include')
-rw-r--r--include/net/cfg80211.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 6cb2543a2ee..7202bce7bfe 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -2697,7 +2697,7 @@ void cfg80211_send_unprot_disassoc(struct net_device *dev, const u8 *buf,
* @dev: network device
* @addr: The source MAC address of the frame
* @key_type: The key type that the received frame used
- * @key_id: Key identifier (0..3)
+ * @key_id: Key identifier (0..3). Can be -1 if missing.
* @tsc: The TSC value of the frame that generated the MIC failure (6 octets)
* @gfp: allocation flags
*