summaryrefslogtreecommitdiffstats
path: root/net/mac80211/sta_info.h
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2012-02-20 20:47:17 +0100
committerJohn W. Linville <linville@tuxdriver.com>2012-02-20 20:47:17 +0100
commit9d4990a260ce395493848640bed94fb55f440f10 (patch)
treeab6505e7c7420234575df3f4451f4da0ac38e6dd /net/mac80211/sta_info.h
parentb44: remove __exit from b44_pci_exit() (diff)
parentath9k: stop on rates with idx -1 in ath9k rate control's .tx_status (diff)
downloadlinux-9d4990a260ce395493848640bed94fb55f440f10.tar.xz
linux-9d4990a260ce395493848640bed94fb55f440f10.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'net/mac80211/sta_info.h')
-rw-r--r--net/mac80211/sta_info.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h
index 6f77f12dc3fc..bfed851d0d36 100644
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
@@ -52,6 +52,7 @@
* @WLAN_STA_SP: Station is in a service period, so don't try to
* reply to other uAPSD trigger frames or PS-Poll.
* @WLAN_STA_4ADDR_EVENT: 4-addr event was already sent for this frame.
+ * @WLAN_STA_RATE_CONTROL: rate control was initialized for this station.
*/
enum ieee80211_sta_info_flags {
WLAN_STA_AUTH,
@@ -71,6 +72,7 @@ enum ieee80211_sta_info_flags {
WLAN_STA_UAPSD,
WLAN_STA_SP,
WLAN_STA_4ADDR_EVENT,
+ WLAN_STA_RATE_CONTROL,
};
enum ieee80211_sta_state {