Skip to content

Commit df1cb9b

Browse files
Baochen Qiangopsiff
authored andcommitted
wifi: ath11k: rename ath11k_start_vdev_delay()
[ Upstream commit 629642f ] Rename ath11k_start_vdev_delay() as ath11k_mac_start_vdev_delay() to follow naming convention. Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1 Tested-on: WCN6855 hw2.1 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23 Tested-on: QCN9074 hw1.0 PCI WLAN.HK.2.7.0.1-01744-QCAHKSWPL_SILICONZ-1 Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.7.0.1-01744-QCAHKSWPL_SILICONZ-1 Signed-off-by: Baochen Qiang <quic_bqiang@quicinc.com> Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com> Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com> Link: https://msgid.link/20240123025700.2929-3-quic_bqiang@quicinc.com Stable-dep-of: 97acb02 ("wifi: ath11k: fix group data packet drops during rekey") Signed-off-by: Sasha Levin <sashal@kernel.org> (cherry picked from commit 38b86b0a37df064c7694871e8583ff9204482f88)
1 parent 8f2b919 commit df1cb9b

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

  • drivers/net/wireless/ath/ath11k

drivers/net/wireless/ath/ath11k/mac.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,8 @@ static const u32 ath11k_smps_map[] = {
254254
[WLAN_HT_CAP_SM_PS_DISABLED] = WMI_PEER_SMPS_PS_NONE,
255255
};
256256

257-
static int ath11k_start_vdev_delay(struct ieee80211_hw *hw,
258-
struct ieee80211_vif *vif);
257+
static int ath11k_mac_start_vdev_delay(struct ieee80211_hw *hw,
258+
struct ieee80211_vif *vif);
259259

260260
enum nl80211_he_ru_alloc ath11k_mac_phy_he_ru_to_nl80211_he_ru_alloc(u16 ru_phy)
261261
{
@@ -4966,7 +4966,7 @@ static int ath11k_mac_station_add(struct ath11k *ar,
49664966
if (ab->hw_params.vdev_start_delay &&
49674967
!arvif->is_started &&
49684968
arvif->vdev_type != WMI_VDEV_TYPE_AP) {
4969-
ret = ath11k_start_vdev_delay(ar->hw, vif);
4969+
ret = ath11k_mac_start_vdev_delay(ar->hw, vif);
49704970
if (ret) {
49714971
ath11k_warn(ab, "failed to delay vdev start: %d\n", ret);
49724972
goto free_tx_stats;
@@ -7549,8 +7549,8 @@ static void ath11k_mac_op_change_chanctx(struct ieee80211_hw *hw,
75497549
mutex_unlock(&ar->conf_mutex);
75507550
}
75517551

7552-
static int ath11k_start_vdev_delay(struct ieee80211_hw *hw,
7553-
struct ieee80211_vif *vif)
7552+
static int ath11k_mac_start_vdev_delay(struct ieee80211_hw *hw,
7553+
struct ieee80211_vif *vif)
75547554
{
75557555
struct ath11k *ar = hw->priv;
75567556
struct ath11k_base *ab = ar->ab;

0 commit comments

Comments
 (0)