diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-01-03 15:16:34 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-01-03 15:16:34 -0500 |
| commit | 57adc1fcbae2c13104ce291b40f23e40a414fa87 (patch) | |
| tree | a22d95cd3a96cbd515cd24fb0833739576c5e92f /include/net/mac80211.h | |
| parent | faa85aa24286a9e14ae7cc797352350c3ac39986 (diff) | |
| parent | dc0d633e35643662f27a0b1c531da3cd6b204b9c (diff) | |
| download | talos-op-linux-57adc1fcbae2c13104ce291b40f23e40a414fa87.tar.gz talos-op-linux-57adc1fcbae2c13104ce291b40f23e40a414fa87.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/b43/dma.c
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
Diffstat (limited to 'include/net/mac80211.h')
| -rw-r--r-- | include/net/mac80211.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 5b5c8a7e26d7..2a7523edd9b5 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -3502,9 +3502,12 @@ void ieee80211_send_bar(struct ieee80211_vif *vif, u8 *ra, u16 tid, u16 ssn); * * @IEEE80211_RC_HT_CHANGED: The HT parameters of the operating channel have * changed, rate control algorithm can update its internal state if needed. + * @IEEE80211_RC_SMPS_CHANGED: The SMPS state of the station changed, the rate + * control algorithm needs to adjust accordingly. */ enum rate_control_changed { - IEEE80211_RC_HT_CHANGED = BIT(0) + IEEE80211_RC_HT_CHANGED = BIT(0), + IEEE80211_RC_SMPS_CHANGED = BIT(1), }; /** |
