From: Luca Coelho <luciano.coelho@xxxxxxxxx> Hi Johannes, Here are the pending mac80211 patches from our internal tree. There is a couple of bugfixes, a cleanup and a small improvement in tracing. Please review. Cheers, Luca. Emmanuel Grumbach (2): mac80211: don't send SMPS action frame in AP mode when not needed mac80211: add the action to the drv_ampdu_action tracepoint Johannes Berg (2): mac80211: set bss_info data before configuring the channel mac80211: remove 5/10 MHz rate code from station MLME net/mac80211/cfg.c | 2 ++ net/mac80211/mlme.c | 62 ++++++++++++++++++++++++++-------------------------- net/mac80211/trace.h | 11 ++++++---- 3 files changed, 40 insertions(+), 35 deletions(-) -- 2.11.0