aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/mac80211.h
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-10-08 04:59:33 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-10-31 18:58:53 -0400
commit7a5158ef8da70fdedeb0530faaa8128aa645be3c (patch)
tree6db285b5fc4971c5e15168fc0fb7cf442b89f168 /include/net/mac80211.h
parente87a2feea75e3cba7af43ed9317b56b282d87742 (diff)
mac80211: fix short slot handling
This patch makes mac80211 handle short slot requests from the AP properly. Also warn about uses of IEEE80211_CONF_SHORT_SLOT_TIME and optimise out the code since it cannot ever be hit anyway. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/net/mac80211.h')
-rw-r--r--include/net/mac80211.h28
1 files changed, 16 insertions, 12 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 2fab5a7e5db7..d1466e7a47b8 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -180,8 +180,12 @@ enum ieee80211_bss_change {
180 * @assoc: association status 180 * @assoc: association status
181 * @aid: association ID number, valid only when @assoc is true 181 * @aid: association ID number, valid only when @assoc is true
182 * @use_cts_prot: use CTS protection 182 * @use_cts_prot: use CTS protection
183 * @use_short_preamble: use 802.11b short preamble 183 * @use_short_preamble: use 802.11b short preamble;
184 * @use_short_slot: use short slot time (only relevant for ERP) 184 * if the hardware cannot handle this it must set the
185 * IEEE80211_HW_2GHZ_SHORT_PREAMBLE_INCAPABLE hardware flag
186 * @use_short_slot: use short slot time (only relevant for ERP);
187 * if the hardware cannot handle this it must set the
188 * IEEE80211_HW_2GHZ_SHORT_SLOT_INCAPABLE hardware flag
185 * @dtim_period: num of beacons before the next DTIM, for PSM 189 * @dtim_period: num of beacons before the next DTIM, for PSM
186 * @timestamp: beacon timestamp 190 * @timestamp: beacon timestamp
187 * @beacon_int: beacon interval 191 * @beacon_int: beacon interval
@@ -442,23 +446,23 @@ struct ieee80211_rx_status {
442 * 446 *
443 * Flags to define PHY configuration options 447 * Flags to define PHY configuration options
444 * 448 *
445 * @IEEE80211_CONF_SHORT_SLOT_TIME: use 802.11g short slot time
446 * @IEEE80211_CONF_RADIOTAP: add radiotap header at receive time (if supported) 449 * @IEEE80211_CONF_RADIOTAP: add radiotap header at receive time (if supported)
447 * @IEEE80211_CONF_SUPPORT_HT_MODE: use 802.11n HT capabilities (if supported) 450 * @IEEE80211_CONF_SUPPORT_HT_MODE: use 802.11n HT capabilities (if supported)
448 * @IEEE80211_CONF_PS: Enable 802.11 power save mode 451 * @IEEE80211_CONF_PS: Enable 802.11 power save mode
449 */ 452 */
450enum ieee80211_conf_flags { 453enum ieee80211_conf_flags {
451 /* 454 IEEE80211_CONF_RADIOTAP = (1<<0),
452 * TODO: IEEE80211_CONF_SHORT_SLOT_TIME will be removed once drivers 455 IEEE80211_CONF_SUPPORT_HT_MODE = (1<<1),
453 * have been converted to use bss_info_changed() for slot time 456 IEEE80211_CONF_PS = (1<<2),
454 * configuration
455 */
456 IEEE80211_CONF_SHORT_SLOT_TIME = (1<<0),
457 IEEE80211_CONF_RADIOTAP = (1<<1),
458 IEEE80211_CONF_SUPPORT_HT_MODE = (1<<2),
459 IEEE80211_CONF_PS = (1<<3),
460}; 457};
461 458
459/* XXX: remove all this once drivers stop trying to use it */
460static inline int __deprecated __IEEE80211_CONF_SHORT_SLOT_TIME(void)
461{
462 return 0;
463}
464#define IEEE80211_CONF_SHORT_SLOT_TIME (__IEEE80211_CONF_SHORT_SLOT_TIME())
465
462/** 466/**
463 * struct ieee80211_conf - configuration of the device 467 * struct ieee80211_conf - configuration of the device
464 * 468 *