package/kernel/mac80211/patches/rt2x00/001-rt2800-enable-MFP-support-unconditionally.patch

   1 From b6b15e20421fefae9f78274f9fef80bc97bf5d5c Mon Sep 17 00:00:00 2001
   2 From: Rui Salvaterra <rsalvaterra@gmail.com>
   3 Date: Mon, 25 May 2020 14:49:07 +0100
   4 Subject: [PATCH] rt2800: enable MFP support unconditionally
   5
   6 This gives us WPA3 support out of the box without having to manually disable
   7 hardware crypto. The driver will fall back to software crypto if the connection
   8 requires management frame protection.
   9
  10 Suggested-by: Stanislaw Gruszka <stf_xl@wp.pl>
  11 Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
  12 Acked-by: Stanislaw Gruszka <stf_xl@wp.pl>
  13 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  14 Link: https://lore.kernel.org/r/20200525134906.1672-1-rsalvaterra@gmail.com
  15 ---
  16  drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 4 +---
  17  drivers/net/wireless/ralink/rt2x00/rt2x00mac.c | 3 ++-
  18  2 files changed, 3 insertions(+), 4 deletions(-)
  19
  20 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
  21 +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
  22 @@ -9971,9 +9971,7 @@ static int rt2800_probe_hw_mode(struct r
  23         if (!rt2x00_is_usb(rt2x00dev))
  24                 ieee80211_hw_set(rt2x00dev->hw, HOST_BROADCAST_PS_BUFFERING);
  25
  26 -       /* Set MFP if HW crypto is disabled. */
  27 -       if (rt2800_hwcrypt_disabled(rt2x00dev))
  28 -               ieee80211_hw_set(rt2x00dev->hw, MFP_CAPABLE);
  29 +       ieee80211_hw_set(rt2x00dev->hw, MFP_CAPABLE);
  30
  31         SET_IEEE80211_DEV(rt2x00dev->hw, rt2x00dev->dev);
  32         SET_IEEE80211_PERM_ADDR(rt2x00dev->hw,
  33 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00mac.c
  34 +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00mac.c
  35 @@ -468,7 +468,8 @@ int rt2x00mac_set_key(struct ieee80211_h
  36         if (!test_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags))
  37                 return 0;
  38
  39 -       if (!rt2x00_has_cap_hw_crypto(rt2x00dev))
  40 +       /* The hardware can't do MFP */
  41 +       if (!rt2x00_has_cap_hw_crypto(rt2x00dev) || (sta && sta->mfp))
  42                 return -EOPNOTSUPP;
  43
  44         /*