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, 12 insertions, 0 deletions

diff --git a/drivers/net/wireless/p54/main.c b/drivers/net/wireless/p54/main.c
index 2969d5321ca6..aadda99989c0 100644
--- a/drivers/net/wireless/p54/main.c
+++ b/drivers/net/wireless/p54/main.c
@@ -515,6 +515,17 @@ static int p54_set_key(struct ieee80211_hw *dev, enum set_key_cmd cmd,
         if (modparam_nohwcrypt)
                 return -EOPNOTSUPP;
 
+        if (key->flags & IEEE80211_KEY_FLAG_RX_MGMT) {
+                /*
+                 * Unfortunately most/all firmwares are trying to decrypt
+                 * incoming management frames if a suitable key can be found.
+                 * However, in doing so the data in these frames gets
+                 * corrupted. So, we can't have firmware supported crypto
+                 * offload in this case.
+                 */
+                return -EOPNOTSUPP;
+        }
+
         mutex_lock(&priv->conf_mutex);
         if (cmd == SET_KEY) {
                 switch (key->cipher) {
@@ -738,6 +749,7 @@ struct ieee80211_hw *p54_init_common(size_t priv_data_len)
                      IEEE80211_HW_SIGNAL_DBM |
                      IEEE80211_HW_SUPPORTS_PS |
                      IEEE80211_HW_PS_NULLFUNC_STACK |
+                     IEEE80211_HW_MFP_CAPABLE |
                      IEEE80211_HW_REPORTS_TX_ACK_STATUS;
 
         dev->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) |