Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

2008-10-14 23:19:16 -07:00
parent eef9d90dcd 8713a7ccd8
commit ab55570d64
21 changed files with 67 additions and 32 deletions
--- 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;