mac80211: update to version 5.9.1

[openwrt/staging/nbd.git] / package / kernel / mac80211 / patches / rtl / 001-03-v6.9-wifi-rtl8xxxu-support-setting-linktype-for-both-inte.patch

diff --git a/package/kernel/mac80211/patches/rtl/001-03-v6.9-wifi-rtl8xxxu-support-setting-linktype-for-both-inte.patch b/package/kernel/mac80211/patches/rtl/001-03-v6.9-wifi-rtl8xxxu-support-setting-linktype-for-both-inte.patch
deleted file mode 100644 (file)
index f473fad..0000000
--- a/package/kernel/mac80211/patches/rtl/001-03-v6.9-wifi-rtl8xxxu-support-setting-linktype-for-both-inte.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From 7f444692cde83c1455682c2d0d2c9a666422b867 Mon Sep 17 00:00:00 2001
-From: Martin Kaistra <martin.kaistra@linutronix.de>
-Date: Fri, 22 Dec 2023 11:14:24 +0100
-Subject: [PATCH 03/21] wifi: rtl8xxxu: support setting linktype for both
- interfaces
-
-To prepare for concurrent mode, enhance the set_linktype function to be
-able to set the linktype in the MSR register for both hardware ports.
-
-Until the users of set_linktype can handle multiple interfaces, use
-port_num = 0.
-
-Signed-off-by: Martin Kaistra <martin.kaistra@linutronix.de>
-Reviewed-by: Ping-Ke Shih <pkshih@realtek.com>
-Signed-off-by: Kalle Valo <kvalo@kernel.org>
-Link: https://msgid.link/20231222101442.626837-4-martin.kaistra@linutronix.de
----
- .../wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 37 +++++++++++--------
- 1 file changed, 22 insertions(+), 15 deletions(-)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
-@@ -1633,33 +1633,41 @@ rtl8xxxu_gen1_set_tx_power(struct rtl8xx
- }
- 
- static void rtl8xxxu_set_linktype(struct rtl8xxxu_priv *priv,
--                                enum nl80211_iftype linktype)
-+                                enum nl80211_iftype linktype, int port_num)
- {
--      u8 val8;
--
--      val8 = rtl8xxxu_read8(priv, REG_MSR);
--      val8 &= ~MSR_LINKTYPE_MASK;
-+      u8 val8, type;
- 
-       switch (linktype) {
-       case NL80211_IFTYPE_UNSPECIFIED:
--              val8 |= MSR_LINKTYPE_NONE;
-+              type = MSR_LINKTYPE_NONE;
-               break;
-       case NL80211_IFTYPE_ADHOC:
--              val8 |= MSR_LINKTYPE_ADHOC;
-+              type = MSR_LINKTYPE_ADHOC;
-               break;
-       case NL80211_IFTYPE_STATION:
--              val8 |= MSR_LINKTYPE_STATION;
-+              type = MSR_LINKTYPE_STATION;
-               break;
-       case NL80211_IFTYPE_AP:
--              val8 |= MSR_LINKTYPE_AP;
-+              type = MSR_LINKTYPE_AP;
-               break;
-       default:
--              goto out;
-+              return;
-+      }
-+
-+      switch (port_num) {
-+      case 0:
-+              val8 = rtl8xxxu_read8(priv, REG_MSR) & 0x0c;
-+              val8 |= type;
-+              break;
-+      case 1:
-+              val8 = rtl8xxxu_read8(priv, REG_MSR) & 0x03;
-+              val8 |= type << 2;
-+              break;
-+      default:
-+              return;
-       }
- 
-       rtl8xxxu_write8(priv, REG_MSR, val8);
--out:
--      return;
- }
- 
- static void
-@@ -4236,7 +4244,6 @@ static int rtl8xxxu_init_device(struct i
-       }
- 
-       rtl8xxxu_set_mac(priv);
--      rtl8xxxu_set_linktype(priv, NL80211_IFTYPE_STATION);
- 
-       /*
-        * Configure initial WMAC settings
-@@ -4964,7 +4971,7 @@ rtl8xxxu_bss_info_changed(struct ieee802
-       if (changed & BSS_CHANGED_ASSOC) {
-               dev_dbg(dev, "Changed ASSOC: %i!\n", vif->cfg.assoc);
- 
--              rtl8xxxu_set_linktype(priv, vif->type);
-+              rtl8xxxu_set_linktype(priv, vif->type, 0);
- 
-               if (vif->cfg.assoc) {
-                       u32 ramask;
-@@ -6610,7 +6617,7 @@ static int rtl8xxxu_add_interface(struct
-               ret = -EOPNOTSUPP;
-       }
- 
--      rtl8xxxu_set_linktype(priv, vif->type);
-+      rtl8xxxu_set_linktype(priv, vif->type, 0);
-       ether_addr_copy(priv->mac_addr, vif->addr);
-       rtl8xxxu_set_mac(priv);
-