From: Mehmet Fide The driver never writes the beacon interval register, so the hardware keeps its default of 100 TU. An AP started with another interval says that interval in its beacons and sends them 100 TU apart. With beacon_int=200 in hostapd the beacons of an RTL8822CE, RTL8822CU, RTL8822BU and RTL8821CU are 102.4 ms apart on the air. Write the interval when mac80211 sets it. The beaconing interface is always on port 0: rtw_core_port_switch() moves an AP there. Reported-by: Luka Gejak Closes: https://lore.kernel.org/linux-wireless/1D396970-35B7-4B0B-82E9-24B523AD69C2@linux.dev/ Fixes: e3037485c68e ("rtw88: new Realtek 802.11ac driver") Signed-off-by: Mehmet Fide --- Notes: Tested on rtw-next on an RTL8822CE, RTL8822CU, RTL8822BU and RTL8821CU as AP with hostapd, the beacons sniffed from a second machine: with beacon_int 50, 100 and 200 they are 51.2, 102.4 and 204.8 ms apart on the air. AP, association, power save, firmware crash and scan tests on the same chips on both bands gave no new kernel report. drivers/net/wireless/realtek/rtw88/mac80211.c | 4 ++++ drivers/net/wireless/realtek/rtw88/reg.h | 1 + 2 files changed, 5 insertions(+) diff --git a/drivers/net/wireless/realtek/rtw88/mac80211.c b/drivers/net/wireless/realtek/rtw88/mac80211.c index 5e40cf06a9e3..5f411df5586e 100644 --- a/drivers/net/wireless/realtek/rtw88/mac80211.c +++ b/drivers/net/wireless/realtek/rtw88/mac80211.c @@ -432,6 +432,10 @@ static void rtw_ops_bss_info_changed(struct ieee80211_hw *hw, if (changed & BSS_CHANGED_BEACON_INT) { if (ieee80211_vif_type_p2p(vif) == NL80211_IFTYPE_STATION) coex_stat->wl_beacon_interval = conf->beacon_int; + else if (vif->type != NL80211_IFTYPE_STATION && + rtwvif->port == RTW_PORT_0) + rtw_write16(rtwdev, REG_MBSSID_BCN_SPACE, + conf->beacon_int); } if (changed & BSS_CHANGED_BEACON) { diff --git a/drivers/net/wireless/realtek/rtw88/reg.h b/drivers/net/wireless/realtek/rtw88/reg.h index afcdb66fdb9a..877b82640e91 100644 --- a/drivers/net/wireless/realtek/rtw88/reg.h +++ b/drivers/net/wireless/realtek/rtw88/reg.h @@ -498,6 +498,7 @@ #define BIT_EN_BCN_FUNCTION BIT(3) #define BIT_EN_TXBCN_RPT BIT(2) #define REG_BCN_CTRL_CLINT0 0x0551 +#define REG_MBSSID_BCN_SPACE 0x0554 #define REG_DRVERLYINT 0x0558 #define REG_BCNDMATIM 0x0559 #define REG_ATIMWND 0x055A base-commit: 61a5eb87b2d9b4d5e353780b781cf691f39ba9e1 -- 2.56.0