<html><head><meta name="color-scheme" content="light dark"></head><body><pre style="word-wrap: break-word; white-space: pre-wrap;">From f232e9d91bb84817c60c051a3e3b56dd2721a7b3 Mon Sep 17 00:00:00 2001
From: Martin Kaistra &lt;martin.kaistra@linutronix.de&gt;
Date: Fri, 22 Dec 2023 11:14:39 +0100
Subject: [PATCH 18/21] wifi: rtl8xxxu: remove obsolete priv-&gt;vif

Now that all uses of priv-&gt;vif have been converted to priv-&gt;vifs[]
remove the old attribute.

Signed-off-by: Martin Kaistra &lt;martin.kaistra@linutronix.de&gt;
Reviewed-by: Ping-Ke Shih &lt;pkshih@realtek.com&gt;
Signed-off-by: Kalle Valo &lt;kvalo@kernel.org&gt;
Link: https://msgid.link/20231222101442.626837-19-martin.kaistra@linutronix.de
---
 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h      | 5 -----
 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 2 --
 2 files changed, 7 deletions(-)

--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
@@ -1893,11 +1893,6 @@ struct rtl8xxxu_priv {
 	u8 rssi_level;
 	DECLARE_BITMAP(tx_aggr_started, IEEE80211_NUM_TIDS);
 	DECLARE_BITMAP(tid_tx_operational, IEEE80211_NUM_TIDS);
-	/*
-	 * Only one virtual interface permitted because only STA mode
-	 * is supported and no iface_combinations are provided.
-	 */
-	struct ieee80211_vif *vif;
 
 	struct ieee80211_vif *vifs[2];
 	struct delayed_work ra_watchdog;
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
@@ -6666,7 +6666,6 @@ static int rtl8xxxu_add_interface(struct
 	}
 
 	priv-&gt;vifs[port_num] = vif;
-	priv-&gt;vif = vif;
 	rtlvif-&gt;port_num = port_num;
 
 	rtl8xxxu_set_linktype(priv, vif-&gt;type, port_num);
@@ -6684,7 +6683,6 @@ static void rtl8xxxu_remove_interface(st
 
 	dev_dbg(&amp;priv-&gt;udev-&gt;dev, "%s\n", __func__);
 
-	priv-&gt;vif = NULL;
 	priv-&gt;vifs[rtlvif-&gt;port_num] = NULL;
 }
 
</pre></body></html>