diff options
| author | David S. Miller | 2008-10-15 08:19:16 +0200 |
|---|---|---|
| committer | David S. Miller | 2008-10-15 08:19:16 +0200 |
| commit | ab55570d64d5409fa940e85dd8de2594b160f826 (patch) | |
| tree | 4010f080f2631e046ee4b5dcb29c8df2cfb9ee7e /include | |
| parent | netns: correct mib stats in ip6_route_me_harder() (diff) | |
| parent | rt2x00: fix regression introduced by "mac80211: free up 2 bytes in skb->cb" (diff) | |
| download | kernel-qcow2-linux-ab55570d64d5409fa940e85dd8de2594b160f826.tar.gz kernel-qcow2-linux-ab55570d64d5409fa940e85dd8de2594b160f826.tar.xz kernel-qcow2-linux-ab55570d64d5409fa940e85dd8de2594b160f826.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'include')
| -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 { * - 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; |