diff options
| author | Jouni Malinen <j@w1.fi> | 2010-11-05 01:23:17 +0200 |
|---|---|---|
| committer | Jouni Malinen <j@w1.fi> | 2010-11-05 01:23:17 +0200 |
| commit | 7e3c178142f68daaea081e2b9e0bd78a6bcd0d47 (patch) | |
| tree | edbe598c5140a2b1bb269d0a0721f0cfe0363fe8 /hostapd/config_file.c | |
| parent | ccb7e5ee599249d840037a2616222f5c9678f994 (diff) | |
| download | external_wpa_supplicant_8_ti-7e3c178142f68daaea081e2b9e0bd78a6bcd0d47.zip external_wpa_supplicant_8_ti-7e3c178142f68daaea081e2b9e0bd78a6bcd0d47.tar.gz external_wpa_supplicant_8_ti-7e3c178142f68daaea081e2b9e0bd78a6bcd0d47.tar.bz2 | |
Remove unused TX queue parameters related to Beacon frames
These are not used by any driver wrapper, i.e., only the four
data queues (BK, BE, VI, VO) are configurable. Better remove these
so that there is no confusion about being able to configure
something additional.
Diffstat (limited to 'hostapd/config_file.c')
| -rw-r--r-- | hostapd/config_file.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/hostapd/config_file.c b/hostapd/config_file.c index e53d9c1..ac69f24 100644 --- a/hostapd/config_file.c +++ b/hostapd/config_file.c @@ -752,10 +752,7 @@ enum { IEEE80211_TX_QUEUE_DATA0 = 0, /* used for EDCA AC_VO data */ IEEE80211_TX_QUEUE_DATA1 = 1, /* used for EDCA AC_VI data */ IEEE80211_TX_QUEUE_DATA2 = 2, /* used for EDCA AC_BE data */ - IEEE80211_TX_QUEUE_DATA3 = 3, /* used for EDCA AC_BK data */ - IEEE80211_TX_QUEUE_DATA4 = 4, - IEEE80211_TX_QUEUE_AFTER_BEACON = 6, - IEEE80211_TX_QUEUE_BEACON = 7 + IEEE80211_TX_QUEUE_DATA3 = 3 /* used for EDCA AC_BK data */ }; static int hostapd_config_tx_queue(struct hostapd_config *conf, char *name, @@ -771,17 +768,21 @@ static int hostapd_config_tx_queue(struct hostapd_config *conf, char *name, pos[4] >= '0' && pos[4] <= '9' && pos[5] == '_') { num = pos[4] - '0'; pos += 6; - } else if (os_strncmp(pos, "after_beacon_", 13) == 0) { - num = IEEE80211_TX_QUEUE_AFTER_BEACON; - pos += 13; - } else if (os_strncmp(pos, "beacon_", 7) == 0) { - num = IEEE80211_TX_QUEUE_BEACON; - pos += 7; + } else if (os_strncmp(pos, "after_beacon_", 13) == 0 || + os_strncmp(pos, "beacon_", 7) == 0) { + wpa_printf(MSG_INFO, "DEPRECATED: '%s' not used", name); + return 0; } else { wpa_printf(MSG_ERROR, "Unknown tx_queue name '%s'", pos); return -1; } + if (num >= NUM_TX_QUEUES) { + /* for backwards compatibility, do not tricker failure */ + wpa_printf(MSG_INFO, "DEPRECATED: '%s' not used", name); + return 0; + } + queue = &conf->tx_queue[num]; if (os_strcmp(pos, "aifs") == 0) { |