aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2011-09-11 02:46:55 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-09-16 16:36:35 -0400
commit910868db3f114df32387a9c51a729b2645febe4d (patch)
tree00b0a9df523665670cf1a28c6fbcba39ae19e9a3
parentbd1a272806e6554c54959f2b46f6d40c182468c0 (diff)
nl80211/cfg80211/mac80211: fix wme docs
Add/fix some missing docs. Signed-off-by: Eliad Peller <eliad@wizery.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--include/linux/nl80211.h6
-rw-r--r--include/net/cfg80211.h4
-rw-r--r--include/net/mac80211.h3
3 files changed, 11 insertions, 2 deletions
diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h
index 8aa7badc1966..f17307590e61 100644
--- a/include/linux/nl80211.h
+++ b/include/linux/nl80211.h
@@ -2541,8 +2541,10 @@ enum nl80211_hidden_ssid {
2541/** 2541/**
2542 * enum nl80211_sta_wme_attr - station WME attributes 2542 * enum nl80211_sta_wme_attr - station WME attributes
2543 * @__NL80211_STA_WME_INVALID: invalid number for nested attribute 2543 * @__NL80211_STA_WME_INVALID: invalid number for nested attribute
2544 * @NL80211_STA_WME_QUEUES: bitmap of uapsd queues. 2544 * @NL80211_STA_WME_UAPSD_QUEUES: bitmap of uapsd queues. the format
2545 * @NL80211_STA_WME_MAX_SP: max service period. 2545 * is the same as the AC bitmap in the QoS info field.
2546 * @NL80211_STA_WME_MAX_SP: max service period. the format is the same
2547 * as the MAX_SP field in the QoS info field (but already shifted down).
2546 * @__NL80211_STA_WME_AFTER_LAST: internal 2548 * @__NL80211_STA_WME_AFTER_LAST: internal
2547 * @NL80211_STA_WME_MAX: highest station WME attribute 2549 * @NL80211_STA_WME_MAX: highest station WME attribute
2548 */ 2550 */
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 95980317d983..b42136a61f3a 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -441,6 +441,10 @@ enum plink_actions {
441 * @plink_action: plink action to take 441 * @plink_action: plink action to take
442 * @plink_state: set the peer link state for a station 442 * @plink_state: set the peer link state for a station
443 * @ht_capa: HT capabilities of station 443 * @ht_capa: HT capabilities of station
444 * @uapsd_queues: bitmap of queues configured for uapsd. same format
445 * as the AC bitmap in the QoS info field
446 * @max_sp: max Service Period. same format as the MAX_SP in the
447 * QoS info field (but already shifted down)
444 */ 448 */
445struct station_parameters { 449struct station_parameters {
446 u8 *supported_rates; 450 u8 *supported_rates;
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 643e1291a1e8..9edba09547e4 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -955,6 +955,9 @@ enum set_key_cmd {
955 * @wme: indicates whether the STA supports WME. Only valid during AP-mode. 955 * @wme: indicates whether the STA supports WME. Only valid during AP-mode.
956 * @drv_priv: data area for driver use, will always be aligned to 956 * @drv_priv: data area for driver use, will always be aligned to
957 * sizeof(void *), size is determined in hw information. 957 * sizeof(void *), size is determined in hw information.
958 * @uapsd_queues: bitmap of queues configured for uapsd. Only valid
959 * if wme is supported.
960 * @max_sp: max Service Period. Only valid if wme is supported.
958 */ 961 */
959struct ieee80211_sta { 962struct ieee80211_sta {
960 u32 supp_rates[IEEE80211_NUM_BANDS]; 963 u32 supp_rates[IEEE80211_NUM_BANDS];