diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2010-06-07 05:12:27 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-06-08 09:31:21 -0400 |
commit | abe37c4b84502d6931e04e94c9c2c45b4da8c889 (patch) | |
tree | 2f89cecdd07faa27b8cc41944eb018e13c07d8b7 /include/net/mac80211.h | |
parent | 90b726097ba0dcc1f9725182513e669a30e77db5 (diff) |
wireless: fix kernel-doc
Fix a whole bunch of kernel-doc warnings
and errors that crop up when running it on
mac80211 and cfg80211; the latter isn't
normally done so lots of bit-rot happened.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/net/mac80211.h')
-rw-r--r-- | include/net/mac80211.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index e3c1d4794003..abb3b1a9ddc9 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h | |||
@@ -313,9 +313,10 @@ enum mac80211_tx_control_flags { | |||
313 | IEEE80211_TX_INTFL_NL80211_FRAME_TX = BIT(21), | 313 | IEEE80211_TX_INTFL_NL80211_FRAME_TX = BIT(21), |
314 | IEEE80211_TX_CTL_LDPC = BIT(22), | 314 | IEEE80211_TX_CTL_LDPC = BIT(22), |
315 | IEEE80211_TX_CTL_STBC = BIT(23) | BIT(24), | 315 | IEEE80211_TX_CTL_STBC = BIT(23) | BIT(24), |
316 | #define IEEE80211_TX_CTL_STBC_SHIFT 23 | ||
317 | }; | 316 | }; |
318 | 317 | ||
318 | #define IEEE80211_TX_CTL_STBC_SHIFT 23 | ||
319 | |||
319 | /** | 320 | /** |
320 | * enum mac80211_rate_control_flags - per-rate flags set by the | 321 | * enum mac80211_rate_control_flags - per-rate flags set by the |
321 | * Rate Control algorithm. | 322 | * Rate Control algorithm. |
@@ -813,7 +814,6 @@ enum ieee80211_key_flags { | |||
813 | * encrypted in hardware. | 814 | * encrypted in hardware. |
814 | * @alg: The key algorithm. | 815 | * @alg: The key algorithm. |
815 | * @flags: key flags, see &enum ieee80211_key_flags. | 816 | * @flags: key flags, see &enum ieee80211_key_flags. |
816 | * @ap_addr: AP's MAC address | ||
817 | * @keyidx: the key index (0-3) | 817 | * @keyidx: the key index (0-3) |
818 | * @keylen: key material length | 818 | * @keylen: key material length |
819 | * @key: key material. For ALG_TKIP the key is encoded as a 256-bit (32 byte) | 819 | * @key: key material. For ALG_TKIP the key is encoded as a 256-bit (32 byte) |