In the current implementation, amdpu changes are applied to own_cap, but never actually applied to the stations ht settings, leaving these overrides without effect. Fix this by using the minimum (factor) or maximum (density) of the respective remote and own ampdu values. Signed-off-by: Simon Wunderlich <siwu@xxxxxxxxxxxxxxxxxx> --- This seems to be regression, as this patch was not required in 3.7, most probably "mac80211: fix HT capability overrides for AP station". --- net/mac80211/ht.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net/mac80211/ht.c b/net/mac80211/ht.c index af8cee0..e433c78 100644 --- a/net/mac80211/ht.c +++ b/net/mac80211/ht.c @@ -141,9 +141,11 @@ bool ieee80211_ht_cap_ie_to_sta_ht_cap(struct ieee80211_sub_if_data *sdata, ampdu_info = ht_cap_ie->ampdu_params_info; ht_cap.ampdu_factor = - ampdu_info & IEEE80211_HT_AMPDU_PARM_FACTOR; + min(ampdu_info & IEEE80211_HT_AMPDU_PARM_FACTOR, + own_cap.ampdu_factor); ht_cap.ampdu_density = - (ampdu_info & IEEE80211_HT_AMPDU_PARM_DENSITY) >> 2; + max((ampdu_info & IEEE80211_HT_AMPDU_PARM_DENSITY) >> 2, + own_cap.ampdu_density); /* own MCS TX capabilities */ tx_mcs_set_cap = own_cap.mcs.tx_params; -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
