From: Luca Coelho <luciano.coelho@xxxxxxxxx> Hi, Here are a few patches from our internal tree, including the fix in hwsim to prevent the test failure with Emmanuel's patch from my previous series. Please review. Cheers, Luca. Adiel Aloni (1): mac80211_hwsim: enforce PS_MANUAL_POLL to be set after PS_ENABLED David Spinadel (1): mac80211: Add MIC space only for TX key option Johannes Berg (1): mac80211: don't warn on AID field without top two MSBs set drivers/net/wireless/mac80211_hwsim.c | 17 +++++++++++------ include/net/mac80211.h | 6 +++++- net/mac80211/key.c | 12 +++++++++--- net/mac80211/mlme.c | 9 +++++---- net/mac80211/tx.c | 4 +++- net/mac80211/wpa.c | 16 ++++++++++++---- 6 files changed, 45 insertions(+), 19 deletions(-) -- 2.15.0