Skip to contentSkip to conversation

rt2800: enable MFP support unconditionally

PATCH In review Rui Salvaterra 3 participants 3 messages May 25, 2020 – May 29, 2020 Ralink RT2X00 wireless LAN driver

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 rt2800: enable MFP support unconditionally

v2: fixed null pointer.

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.

---
 drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 4 +---
 drivers/net/wireless/ralink/rt2x00/rt2x00mac.c | 3 ++-
 2 files changed, 3 insertions(+), 4 deletions(-)
drivers/net/wireless/ralink/rt2x00/rt2800lib.c +1 -3
index 6beac1f74e7c..a779fe771a55 100644
@@ -9971,9 +9971,7 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
 	if (!rt2x00_is_usb(rt2x00dev))
 		ieee80211_hw_set(rt2x00dev->hw, HOST_BROADCAST_PS_BUFFERING);
 
-	/* Set MFP if HW crypto is disabled. */
-	if (rt2800_hwcrypt_disabled(rt2x00dev))
-		ieee80211_hw_set(rt2x00dev->hw, MFP_CAPABLE);
+	ieee80211_hw_set(rt2x00dev->hw, MFP_CAPABLE);
 
 	SET_IEEE80211_DEV(rt2x00dev->hw, rt2x00dev->dev);
 	SET_IEEE80211_PERM_ADDR(rt2x00dev->hw,
drivers/net/wireless/ralink/rt2x00/rt2x00mac.c +2 -1
index 32efbc8e9f92..2f68a31072ae 100644
@@ -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;
 
 	/*
Signature · 1 line
2.26.2
maintainer Acked-by on v2 1/1
#1 lore raw
Quoted 1 line · Rui Salvaterra

v2: fixed null pointer.

This should go after --- , but not need to resend patch, Kalle kindly fixes that for us in the patchwork.

Quoted 6 lines

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.

Thanks!

#2 lore raw
In reply to Rui Salvaterra
Quoted 7 lines · Rui Salvaterra

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.

Patch applied to wireless-drivers-next.git, thanks.

b6b15e20421f rt2800: enable MFP support unconditionally

Signature · 3 lines
https://patchwork.kernel.org/patch/11568861/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches