aboutsummaryrefslogtreecommitdiff
path: root/include/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-10-14 23:19:16 -0700
committerDavid S. Miller <davem@davemloft.net>2008-10-14 23:19:16 -0700
commitab55570d64d5409fa940e85dd8de2594b160f826 (patch)
tree4010f080f2631e046ee4b5dcb29c8df2cfb9ee7e /include/net
parenteef9d90dcde7bb4d029b67ed36457efc4970d5a2 (diff)
parent8713a7ccd88d93d9f8a72436088d6627c82490db (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'include/net')
-rw-r--r--include/net/mac80211.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 5617a1613c9..d861197f83c 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -645,7 +645,8 @@ enum ieee80211_key_flags {
* - Temporal Encryption Key (128 bits)
* - Temporal Authenticator Tx MIC Key (64 bits)
* - Temporal Authenticator Rx MIC Key (64 bits)
- *
+ * @icv_len: FIXME
+ * @iv_len: FIXME
*/
struct ieee80211_key_conf {
enum ieee80211_key_alg alg;