diff --git a/[refs] b/[refs] index 12a41bfb2593..ccb74f1e65f9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4233df6b748193d45f79fb7448991a473061a65d +refs/heads/master: e1a65b5828edfddb29c6fb4eb556fa503295146b diff --git a/trunk/include/net/mac80211.h b/trunk/include/net/mac80211.h index 5617a1613c91..d861197f83c7 100644 --- a/trunk/include/net/mac80211.h +++ b/trunk/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;