diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-15 02:19:16 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-15 02:19:16 -0400 |
| commit | ab55570d64d5409fa940e85dd8de2594b160f826 (patch) | |
| tree | 4010f080f2631e046ee4b5dcb29c8df2cfb9ee7e /include/net | |
| parent | eef9d90dcde7bb4d029b67ed36457efc4970d5a2 (diff) | |
| parent | 8713a7ccd88d93d9f8a72436088d6627c82490db (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.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 5617a1613c91..d861197f83c7 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h | |||
| @@ -645,7 +645,8 @@ enum ieee80211_key_flags { | |||
| 645 | * - Temporal Encryption Key (128 bits) | 645 | * - Temporal Encryption Key (128 bits) |
| 646 | * - Temporal Authenticator Tx MIC Key (64 bits) | 646 | * - Temporal Authenticator Tx MIC Key (64 bits) |
| 647 | * - Temporal Authenticator Rx MIC Key (64 bits) | 647 | * - Temporal Authenticator Rx MIC Key (64 bits) |
| 648 | * | 648 | * @icv_len: FIXME |
| 649 | * @iv_len: FIXME | ||
| 649 | */ | 650 | */ |
| 650 | struct ieee80211_key_conf { | 651 | struct ieee80211_key_conf { |
| 651 | enum ieee80211_key_alg alg; | 652 | enum ieee80211_key_alg alg; |