Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
	net/nfc/netlink.c

Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/net/wireless/ath/carl9170/mac.c b/drivers/net/wireless/ath/carl9170/mac.c
index f8676280dc36..e3b1b6e87760 100644
--- a/drivers/net/wireless/ath/carl9170/mac.c
+++ b/drivers/net/wireless/ath/carl9170/mac.c
@@ -304,7 +304,8 @@ int carl9170_set_operating_mode(struct ar9170 *ar)
         struct ath_common *common = &ar->common;
         u8 *mac_addr, *bssid;
         u32 cam_mode = AR9170_MAC_CAM_DEFAULTS;
-        u32 enc_mode = AR9170_MAC_ENCRYPTION_DEFAULTS;
+        u32 enc_mode = AR9170_MAC_ENCRYPTION_DEFAULTS |
+                AR9170_MAC_ENCRYPTION_MGMT_RX_SOFTWARE;
         u32 rx_ctrl = AR9170_MAC_RX_CTRL_DEAGG |
                       AR9170_MAC_RX_CTRL_SHORT_FILTER;
         u32 sniffer = AR9170_MAC_SNIFFER_DEFAULTS;