wifi: rtl8xxxu: remove obsolete priv->vif

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

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-19-martin.kaistra@linutronix.de

diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
index 6a58897446f4c706035f261c7743aacd592e029d..c5e6d8f7d26bd28cb2029c85d484554ef90187aa 100644 (file)
--- 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;

diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
index 09de60251a3664bb9a2f0c17711fdbdec75f2755..07cfce55a5198b447607a03cf0db993bb16bcb5a 100644 (file)
--- 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 ieee80211_hw *hw,
        }
 
        priv->vifs[port_num] = vif;
-       priv->vif = vif;
        rtlvif->port_num = port_num;
 
        rtl8xxxu_set_linktype(priv, vif->type, port_num);
@@ -6684,7 +6683,6 @@ static void rtl8xxxu_remove_interface(struct ieee80211_hw *hw,
 
        dev_dbg(&priv->udev->dev, "%s\n", __func__);
 
-       priv->vif = NULL;
        priv->vifs[rtlvif->port_num] = NULL;
 }