hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mac80211: add hw configuration for max ampdu buffer size 

Some devices don't support the maximum AMDPU buffer size of 64, so we
need to add an option to configure this in the hardware configuration.
This value will be used in the ADDBA response instead of the value
suggested in the request, if the latter is greater than the max
supported.

Signed-off-by: Luciano Coelho <coelho@ti.com>
Tested-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Luciano Coelho 2011-01-12 15:26:30 +02:00 committed by John W. Linville
parent dcac908bab
commit df6ba5d80d
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/net/mac80211.h
View File

@ -1147,6 +1147,13 @@ enum ieee80211_hw_flags {
* @napi_weight: weight used for NAPI polling. You must specify an * @napi_weight: weight used for NAPI polling. You must specify an
* appropriate value here if a napi_poll operation is provided * appropriate value here if a napi_poll operation is provided
* by your driver. * by your driver.
* @max_rx_aggregation_subframes: maximum buffer size (number of
* sub-frames) to be used for A-MPDU block ack receiver
* aggregation.
* This is only relevant if the device has restrictions on the
* number of subframes, if it relies on mac80211 to do reordering
* it shouldn't be set.
*/ */
struct ieee80211_hw { struct ieee80211_hw {
struct ieee80211_conf conf; struct ieee80211_conf conf;
@ -1165,6 +1172,7 @@ struct ieee80211_hw {
u8 max_rates; u8 max_rates;
u8 max_report_rates; u8 max_report_rates;
u8 max_rate_tries; u8 max_rate_tries;
u8 max_rx_aggregation_subframes;
}; };
/** /**

3
net/mac80211/agg-rx.c
View File

@ -239,6 +239,9 @@ void ieee80211_process_addba_request(struct ieee80211_local *local,
buf_size = buf_size << sband->ht_cap.ampdu_factor; buf_size = buf_size << sband->ht_cap.ampdu_factor;
} }
/* make sure the size doesn't exceed the maximum supported by the hw */
if (buf_size > local->hw.max_rx_aggregation_subframes)
buf_size = local->hw.max_rx_aggregation_subframes;
/* examine state machine */ /* examine state machine */
mutex_lock(&sta->ampdu_mlme.mtx); mutex_lock(&sta->ampdu_mlme.mtx);

1
net/mac80211/main.c
View File

@ -552,6 +552,7 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
local->hw.queues = 1; local->hw.queues = 1;
local->hw.max_rates = 1; local->hw.max_rates = 1;
local->hw.max_report_rates = 0; local->hw.max_report_rates = 0;
local->hw.max_rx_aggregation_subframes = IEEE80211_MAX_AMPDU_BUF;
local->hw.conf.long_frame_max_tx_count = wiphy->retry_long; local->hw.conf.long_frame_max_tx_count = wiphy->retry_long;
local->hw.conf.short_frame_max_tx_count = wiphy->retry_short; local->hw.conf.short_frame_max_tx_count = wiphy->retry_short;
local->user_power_level = -1; local->user_power_level = -1;