From: Eliad Peller <eliad@wizery.com>
Date: Sun, 11 Sep 2011 06:46:55 +0000 (+0300)
Subject: nl80211/cfg80211/mac80211: fix wme docs
X-Git-Tag: v3.2~422^2~254^2~24
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=910868db3f114df32387a9c51a729b2645febe4d;p=platform%2Fkernel%2Flinux-amlogic.git

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>
---

diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h
index 8aa7bad..f173075 100644
--- a/include/linux/nl80211.h
+++ b/include/linux/nl80211.h
@@ -2541,8 +2541,10 @@ enum nl80211_hidden_ssid {
 /**
  * enum nl80211_sta_wme_attr - station WME attributes
  * @__NL80211_STA_WME_INVALID: invalid number for nested attribute
- * @NL80211_STA_WME_QUEUES: bitmap of uapsd queues.
- * @NL80211_STA_WME_MAX_SP: max service period.
+ * @NL80211_STA_WME_UAPSD_QUEUES: bitmap of uapsd queues. the format
+ *	is the same as the AC bitmap in the QoS info field.
+ * @NL80211_STA_WME_MAX_SP: max service period. the format is the same
+ *	as the MAX_SP field in the QoS info field (but already shifted down).
  * @__NL80211_STA_WME_AFTER_LAST: internal
  * @NL80211_STA_WME_MAX: highest station WME attribute
  */
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 9598031..b42136a 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -441,6 +441,10 @@ enum plink_actions {
  * @plink_action: plink action to take
  * @plink_state: set the peer link state for a station
  * @ht_capa: HT capabilities of station
+ * @uapsd_queues: bitmap of queues configured for uapsd. same format
+ *	as the AC bitmap in the QoS info field
+ * @max_sp: max Service Period. same format as the MAX_SP in the
+ *	QoS info field (but already shifted down)
  */
 struct station_parameters {
 	u8 *supported_rates;
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 643e129..9edba09 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -955,6 +955,9 @@ enum set_key_cmd {
  * @wme: indicates whether the STA supports WME. Only valid during AP-mode.
  * @drv_priv: data area for driver use, will always be aligned to
  *	sizeof(void *), size is determined in hw information.
+ * @uapsd_queues: bitmap of queues configured for uapsd. Only valid
+ *	if wme is supported.
+ * @max_sp: max Service Period. Only valid if wme is supported.
  */
 struct ieee80211_sta {
 	u32 supp_rates[IEEE80211_NUM_BANDS];