001-18-v6.9-wifi-rtl8xxxu-remove-obsolete-priv-vif.patch 1.7 KB

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