]> Git Repo - J-linux.git/commitdiff
Merge tag 'rtw-next-2024-07-05' of https://github.com/pkshih/rtw
authorKalle Valo <[email protected]>
Tue, 9 Jul 2024 10:17:09 +0000 (13:17 +0300)
committerKalle Valo <[email protected]>
Tue, 9 Jul 2024 10:17:09 +0000 (13:17 +0300)
rtw-next patches for v6.11

Some cleanups of rtl8xxxu and rtlwifi, and some fixes of rtw88. The major
change is to develop WoWLAN and preparation of RTL8852BE-VT listed below:

rtw89:
  - preparation of RTL8852BE-VT
    * add RF calibration code
    * move shared code with RTL8852BE to common module
  - add WoWLAN for WiFi 6 chips
  - support 36-bit PCI DMA

1  2 
drivers/net/wireless/realtek/rtl8xxxu/core.c
drivers/net/wireless/realtek/rtw89/mac80211.c

index 3685dbefc9bde1b4764d27a53c04df38e059f3ef,e19fd31edfdad37cf0231176acf2d3936e62d54e..043fa364e70148beddd692d77e60c42d651ca66d
@@@ -6679,7 -6679,6 +6679,6 @@@ static void rtl8xxxu_switch_ports(struc
        u8 macid[ETH_ALEN], bssid[ETH_ALEN], macid_1[ETH_ALEN], bssid_1[ETH_ALEN];
        u8 msr, bcn_ctrl, bcn_ctrl_1, atimwnd[2], atimwnd_1[2];
        struct rtl8xxxu_vif *rtlvif;
-       struct ieee80211_vif *vif;
        u8 tsftr[8], tsftr_1[8];
        int i;
  
        /* write bcn ctl */
        rtl8xxxu_write8(priv, REG_BEACON_CTRL, bcn_ctrl_1);
        rtl8xxxu_write8(priv, REG_BEACON_CTRL_1, bcn_ctrl);
-       vif = priv->vifs[0];
-       priv->vifs[0] = priv->vifs[1];
-       priv->vifs[1] = vif;
+       swap(priv->vifs[0], priv->vifs[1]);
  
        /* priv->vifs[0] is NULL here, based on how this function is currently
         * called from rtl8xxxu_add_interface().
@@@ -7521,7 -7517,7 +7517,7 @@@ error_out
        return ret;
  }
  
 -static void rtl8xxxu_stop(struct ieee80211_hw *hw)
 +static void rtl8xxxu_stop(struct ieee80211_hw *hw, bool suspend)
  {
        struct rtl8xxxu_priv *priv = hw->priv;
        unsigned long flags;
index 722d09e9fbb5c3b8f53ed795c93b37b0fb582f07,c8a0ad0cffc9641f3af1e6523da44da56abc561f..1508693032cb209c770f6ce610961bc5afb26ed0
@@@ -66,7 -66,7 +66,7 @@@ static int rtw89_ops_start(struct ieee8
        return ret;
  }
  
 -static void rtw89_ops_stop(struct ieee80211_hw *hw)
 +static void rtw89_ops_stop(struct ieee80211_hw *hw, bool suspend)
  {
        struct rtw89_dev *rtwdev = hw->priv;
  
@@@ -487,6 -487,9 +487,9 @@@ static void rtw89_ops_link_info_changed
        if (changed & BSS_CHANGED_CQM)
                rtw89_fw_h2c_set_bcn_fltr_cfg(rtwdev, vif, true);
  
+       if (changed & BSS_CHANGED_TPE)
+               rtw89_reg_6ghz_recalc(rtwdev, rtwvif, true);
        mutex_unlock(&rtwdev->mutex);
  }
  
This page took 0.078741 seconds and 4 git commands to generate.