summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Wunderlich <simon.wunderlich@s2003.tu-chemnitz.de>2012-03-07 21:31:13 +0100
committerJohn W. Linville <linville@tuxdriver.com>2012-03-08 14:05:07 -0500
commitf44d4eb54432a0109ff15b2669c91f061428ff39 (patch)
tree6ba6fa01e54a595f3da88ad8d53536938c6a40c4
parent1353a7ba7ebe62dedc60a5ba75c434cfad960ede (diff)
downloadlinux-f44d4eb54432a0109ff15b2669c91f061428ff39.tar.bz2
mac80211: update ieee80211_tx_rate_control kerneldoc
* add entry for rate_idx_mcs_mask * fix order of entries to represent the structs' order Signed-off-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--include/net/mac80211.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index c06974accfa6..f7917f765cbc 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -3568,6 +3568,8 @@ enum rate_control_changed {
* @hw: The hardware the algorithm is invoked for.
* @sband: The band this frame is being transmitted on.
* @bss_conf: the current BSS configuration
+ * @skb: the skb that will be transmitted, the control information in it needs
+ * to be filled in
* @reported_rate: The rate control algorithm can fill this in to indicate
* which rate should be reported to userspace as the current rate and
* used for rate calculations in the mesh network.
@@ -3575,12 +3577,11 @@ enum rate_control_changed {
* RTS threshold
* @short_preamble: whether mac80211 will request short-preamble transmission
* if the selected rate supports it
- * @max_rate_idx: user-requested maximum rate (not MCS for now)
+ * @max_rate_idx: user-requested maximum (legacy) rate
* (deprecated; this will be removed once drivers get updated to use
* rate_idx_mask)
- * @rate_idx_mask: user-requested rate mask (not MCS for now)
- * @skb: the skb that will be transmitted, the control information in it needs
- * to be filled in
+ * @rate_idx_mask: user-requested (legacy) rate mask
+ * @rate_idx_mcs_mask: user-requested MCS rate mask
* @bss: whether this frame is sent out in AP or IBSS mode
*/
struct ieee80211_tx_rate_control {