summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ralink/rt2x00/rt2x00mac.c
diff options
context:
space:
mode:
authorRui Salvaterra <rsalvaterra@gmail.com>2020-05-25 15:49:07 +0200
committerKalle Valo <kvalo@codeaurora.org>2020-05-29 17:42:28 +0200
commitb6b15e20421fefae9f78274f9fef80bc97bf5d5c (patch)
tree961556cea49354f81430546c58756ec12c2cb284 /drivers/net/wireless/ralink/rt2x00/rt2x00mac.c
parentMerge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git (diff)
downloadlinux-b6b15e20421fefae9f78274f9fef80bc97bf5d5c.tar.xz
linux-b6b15e20421fefae9f78274f9fef80bc97bf5d5c.zip
rt2800: enable MFP support unconditionally
This gives us WPA3 support out of the box without having to manually disable hardware crypto. The driver will fall back to software crypto if the connection requires management frame protection. Suggested-by: Stanislaw Gruszka <stf_xl@wp.pl> Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com> Acked-by: Stanislaw Gruszka <stf_xl@wp.pl> Signed-off-by: Kalle Valo <kvalo@codeaurora.org> Link: https://lore.kernel.org/r/20200525134906.1672-1-rsalvaterra@gmail.com
Diffstat (limited to '')
-rw-r--r--drivers/net/wireless/ralink/rt2x00/rt2x00mac.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00mac.c b/drivers/net/wireless/ralink/rt2x00/rt2x00mac.c
index 32efbc8e9f92..2f68a31072ae 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00mac.c
@@ -468,7 +468,8 @@ int rt2x00mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
if (!test_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags))
return 0;
- if (!rt2x00_has_cap_hw_crypto(rt2x00dev))
+ /* The hardware can't do MFP */
+ if (!rt2x00_has_cap_hw_crypto(rt2x00dev) || (sta && sta->mfp))
return -EOPNOTSUPP;
/*