From 4169e0893d6f300358bc8c21a71abac87928f65e Mon Sep 17 00:00:00 2001 From: Helmut Schaa Date: Fri, 5 Aug 2011 11:46:19 +0200 Subject: [PATCH] --- yaml --- r: 265400 b: refs/heads/master c: 39e68712d75700ec09770c7ad9e8e4abc65db7c6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/mac80211/main.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3e20d3eba2da..4db13395b419 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3ca97880ea7af47be479aadfe896cafc54939708 +refs/heads/master: 39e68712d75700ec09770c7ad9e8e4abc65db7c6 diff --git a/trunk/net/mac80211/main.c b/trunk/net/mac80211/main.c index 866f269183cf..104fdd9862bd 100644 --- a/trunk/net/mac80211/main.c +++ b/trunk/net/mac80211/main.c @@ -608,6 +608,7 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len, local->hw.max_rates = 1; local->hw.max_report_rates = 0; local->hw.max_rx_aggregation_subframes = IEEE80211_MAX_AMPDU_BUF; + local->hw.max_tx_aggregation_subframes = IEEE80211_MAX_AMPDU_BUF; local->hw.conf.long_frame_max_tx_count = wiphy->retry_long; local->hw.conf.short_frame_max_tx_count = wiphy->retry_short; local->user_power_level = -1;