1 From f232e9d91bb84817c60c051a3e3b56dd2721a7b3 Mon Sep 17 00:00:00 2001
2 From: Martin Kaistra <martin.kaistra@linutronix.de>
3 Date: Fri, 22 Dec 2023 11:14:39 +0100
4 Subject: [PATCH 18/21] wifi: rtl8xxxu: remove obsolete priv->vif
6 Now that all uses of priv->vif have been converted to priv->vifs[]
7 remove the old attribute.
9 Signed-off-by: Martin Kaistra <martin.kaistra@linutronix.de>
10 Reviewed-by: Ping-Ke Shih <pkshih@realtek.com>
11 Signed-off-by: Kalle Valo <kvalo@kernel.org>
12 Link: https://msgid.link/20231222101442.626837-19-martin.kaistra@linutronix.de
14 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 5 -----
15 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 2 --
16 2 files changed, 7 deletions(-)
18 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
19 +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
20 @@ -1893,11 +1893,6 @@ struct rtl8xxxu_priv {
22 DECLARE_BITMAP(tx_aggr_started, IEEE80211_NUM_TIDS);
23 DECLARE_BITMAP(tid_tx_operational, IEEE80211_NUM_TIDS);
25 - * Only one virtual interface permitted because only STA mode
26 - * is supported and no iface_combinations are provided.
28 - struct ieee80211_vif *vif;
30 struct ieee80211_vif *vifs[2];
31 struct delayed_work ra_watchdog;
32 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
33 +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
34 @@ -6666,7 +6666,6 @@ static int rtl8xxxu_add_interface(struct
37 priv->vifs[port_num] = vif;
39 rtlvif->port_num = port_num;
41 rtl8xxxu_set_linktype(priv, vif->type, port_num);
42 @@ -6684,7 +6683,6 @@ static void rtl8xxxu_remove_interface(st
44 dev_dbg(&priv->udev->dev, "%s\n", __func__);
47 priv->vifs[rtlvif->port_num] = NULL;