Commit b6b15e20 authored by Rui Salvaterra's avatar Rui Salvaterra Committed by Kalle Valo
Browse files

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: default avatarStanislaw Gruszka <stf_xl@wp.pl>
Signed-off-by: default avatarRui Salvaterra <rsalvaterra@gmail.com>
Acked-by: default avatarStanislaw Gruszka <stf_xl@wp.pl>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20200525134906.1672-1-rsalvaterra@gmail.com
parent b1cb6ad7

drivers/net/wireless/ralink/rt2x00/rt2800lib.c

+1 −3
Original line number Diff line number Diff line
@@ -9971,8 +9971,6 @@ 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);



	SET_IEEE80211_DEV(rt2x00dev->hw, rt2x00dev->dev);

drivers/net/wireless/ralink/rt2x00/rt2x00mac.c

+2 −1
Original line number Diff line number Diff line
@@ -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;



	/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE