diff options
Diffstat (limited to 'include/net/mac80211.h')
-rw-r--r-- | include/net/mac80211.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index b52721008be8..b397e4d984c7 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h | |||
@@ -177,9 +177,10 @@ enum ieee80211_bss_change { | |||
177 | * @aid: association ID number, valid only when @assoc is true | 177 | * @aid: association ID number, valid only when @assoc is true |
178 | * @use_cts_prot: use CTS protection | 178 | * @use_cts_prot: use CTS protection |
179 | * @use_short_preamble: use 802.11b short preamble | 179 | * @use_short_preamble: use 802.11b short preamble |
180 | * @dtim_period: num of beacons before the next DTIM, for PSM | ||
180 | * @timestamp: beacon timestamp | 181 | * @timestamp: beacon timestamp |
181 | * @beacon_int: beacon interval | 182 | * @beacon_int: beacon interval |
182 | * @assoc_capability: capabbilities taken from assoc resp | 183 | * @assoc_capability: capabilities taken from assoc resp |
183 | * @assoc_ht: association in HT mode | 184 | * @assoc_ht: association in HT mode |
184 | * @ht_conf: ht capabilities | 185 | * @ht_conf: ht capabilities |
185 | * @ht_bss_conf: ht extended capabilities | 186 | * @ht_bss_conf: ht extended capabilities |
@@ -191,6 +192,7 @@ struct ieee80211_bss_conf { | |||
191 | /* erp related data */ | 192 | /* erp related data */ |
192 | bool use_cts_prot; | 193 | bool use_cts_prot; |
193 | bool use_short_preamble; | 194 | bool use_short_preamble; |
195 | u8 dtim_period; | ||
194 | u16 beacon_int; | 196 | u16 beacon_int; |
195 | u16 assoc_capability; | 197 | u16 assoc_capability; |
196 | u64 timestamp; | 198 | u64 timestamp; |
@@ -430,6 +432,7 @@ enum ieee80211_conf_flags { | |||
430 | * @radio_enabled: when zero, driver is required to switch off the radio. | 432 | * @radio_enabled: when zero, driver is required to switch off the radio. |
431 | * TODO make a flag | 433 | * TODO make a flag |
432 | * @beacon_int: beacon interval (TODO make interface config) | 434 | * @beacon_int: beacon interval (TODO make interface config) |
435 | * @listen_interval: listen interval in units of beacon interval | ||
433 | * @flags: configuration flags defined above | 436 | * @flags: configuration flags defined above |
434 | * @power_level: requested transmit power (in dBm) | 437 | * @power_level: requested transmit power (in dBm) |
435 | * @max_antenna_gain: maximum antenna gain (in dBi) | 438 | * @max_antenna_gain: maximum antenna gain (in dBi) |
@@ -444,6 +447,7 @@ struct ieee80211_conf { | |||
444 | int radio_enabled; | 447 | int radio_enabled; |
445 | 448 | ||
446 | int beacon_int; | 449 | int beacon_int; |
450 | u16 listen_interval; | ||
447 | u32 flags; | 451 | u32 flags; |
448 | int power_level; | 452 | int power_level; |
449 | int max_antenna_gain; | 453 | int max_antenna_gain; |
@@ -785,6 +789,9 @@ enum ieee80211_hw_flags { | |||
785 | * @max_signal: Maximum value for signal (rssi) in RX information, used | 789 | * @max_signal: Maximum value for signal (rssi) in RX information, used |
786 | * only when @IEEE80211_HW_SIGNAL_UNSPEC or @IEEE80211_HW_SIGNAL_DB | 790 | * only when @IEEE80211_HW_SIGNAL_UNSPEC or @IEEE80211_HW_SIGNAL_DB |
787 | * | 791 | * |
792 | * @max_listen_interval: max listen interval in units of beacon interval | ||
793 | * that HW supports | ||
794 | * | ||
788 | * @queues: number of available hardware transmit queues for | 795 | * @queues: number of available hardware transmit queues for |
789 | * data packets. WMM/QoS requires at least four, these | 796 | * data packets. WMM/QoS requires at least four, these |
790 | * queues need to have configurable access parameters. | 797 | * queues need to have configurable access parameters. |
@@ -812,7 +819,9 @@ struct ieee80211_hw { | |||
812 | unsigned int extra_tx_headroom; | 819 | unsigned int extra_tx_headroom; |
813 | int channel_change_time; | 820 | int channel_change_time; |
814 | int vif_data_size; | 821 | int vif_data_size; |
815 | u16 queues, ampdu_queues; | 822 | u16 queues; |
823 | u16 ampdu_queues; | ||
824 | u16 max_listen_interval; | ||
816 | s8 max_signal; | 825 | s8 max_signal; |
817 | }; | 826 | }; |
818 | 827 | ||