| Message ID | 20240327004155.7172-1-pkshih@realtek.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Ping-Ke Shih |
| Headers | show |
| Series | [v2] wifi: rtw88: station mode only for SDIO chips | expand |
On Wed, Mar 27, 2024 at 1:43 AM Ping-Ke Shih <pkshih@realtek.com> wrote: > > Since only station mode has been tested on SDIO chips, only keep it support > for SDIO chips to reflect correct supported features. > > Link: https://lore.kernel.org/linux-wireless/87wmpu1do6.fsf@kernel.org/T/#t > Link: https://lore.kernel.org/linux-wireless/36972ff5-0c48-4bd2-8f9a-9649bfa24225@lexina.in/ > Cc: Martin Blumenstingl <martin.blumenstingl@googlemail.com> > Signed-off-by: Ping-Ke Shih <pkshih@realtek.com> Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
On Wed, 2024-03-27 at 23:11 +0100, Martin Blumenstingl wrote: > > On Wed, Mar 27, 2024 at 1:43 AM Ping-Ke Shih <pkshih@realtek.com> wrote: > > Since only station mode has been tested on SDIO chips, only keep it support > > for SDIO chips to reflect correct supported features. > > > > Link: https://lore.kernel.org/linux-wireless/87wmpu1do6.fsf@kernel.org/T/#t > > Link: https://lore.kernel.org/linux-wireless/36972ff5-0c48-4bd2-8f9a-9649bfa24225@lexina.in/ > > Cc: Martin Blumenstingl <martin.blumenstingl@googlemail.com> > > Signed-off-by: Ping-Ke Shih <pkshih@realtek.com> > Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Thanks for the ack. Normally Acked-by is added by maintainer, so I will change to Reviewed-by when applying this patch.
Ping-Ke Shih <pkshih@realtek.com> wrote: > Since only station mode has been tested on SDIO chips, only keep it support > for SDIO chips to reflect correct supported features. > > Link: https://lore.kernel.org/linux-wireless/87wmpu1do6.fsf@kernel.org/T/#t > Link: https://lore.kernel.org/linux-wireless/36972ff5-0c48-4bd2-8f9a-9649bfa24225@lexina.in/ > Cc: Martin Blumenstingl <martin.blumenstingl@googlemail.com> > Signed-off-by: Ping-Ke Shih <pkshih@realtek.com> > Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> 1 patch(es) applied to rtw-next branch of rtw.git, thanks. a54b7a7c773b wifi: rtw88: station mode only for SDIO chips --- https://github.com/pkshih/rtw.git
On Thu, Mar 28, 2024 at 2:53 AM Ping-Ke Shih <pkshih@realtek.com> wrote: > > On Wed, 2024-03-27 at 23:11 +0100, Martin Blumenstingl wrote: > > > > On Wed, Mar 27, 2024 at 1:43 AM Ping-Ke Shih <pkshih@realtek.com> wrote: > > > Since only station mode has been tested on SDIO chips, only keep it support > > > for SDIO chips to reflect correct supported features. > > > > > > Link: https://lore.kernel.org/linux-wireless/87wmpu1do6.fsf@kernel.org/T/#t > > > Link: https://lore.kernel.org/linux-wireless/36972ff5-0c48-4bd2-8f9a-9649bfa24225@lexina.in/ > > > Cc: Martin Blumenstingl <martin.blumenstingl@googlemail.com> > > > Signed-off-by: Ping-Ke Shih <pkshih@realtek.com> > > Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> > > Thanks for the ack. > > Normally Acked-by is added by maintainer, so I will change to Reviewed-by > when applying this patch. Apologies for my late reply. That's fine for me - so just for reference (since you already applied it): Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Best regards, Martin
diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c index 81ef4717dbf4..d1f0e7541bfa 100644 --- a/drivers/net/wireless/realtek/rtw88/main.c +++ b/drivers/net/wireless/realtek/rtw88/main.c @@ -2203,6 +2203,7 @@ EXPORT_SYMBOL(rtw_core_deinit); int rtw_register_hw(struct rtw_dev *rtwdev, struct ieee80211_hw *hw) { + bool sta_mode_only = rtwdev->hci.type == RTW_HCI_TYPE_SDIO; struct rtw_hal *hal = &rtwdev->hal; int max_tx_headroom = 0; int ret; @@ -2231,10 +2232,13 @@ int rtw_register_hw(struct rtw_dev *rtwdev, struct ieee80211_hw *hw) ieee80211_hw_set(hw, TX_AMSDU); ieee80211_hw_set(hw, SINGLE_SCAN_ON_ALL_BANDS); - hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) | - BIT(NL80211_IFTYPE_AP) | - BIT(NL80211_IFTYPE_ADHOC) | - BIT(NL80211_IFTYPE_MESH_POINT); + if (sta_mode_only) + hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION); + else + hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) | + BIT(NL80211_IFTYPE_AP) | + BIT(NL80211_IFTYPE_ADHOC) | + BIT(NL80211_IFTYPE_MESH_POINT); hw->wiphy->available_antennas_tx = hal->antenna_tx; hw->wiphy->available_antennas_rx = hal->antenna_rx; @@ -2245,7 +2249,7 @@ int rtw_register_hw(struct rtw_dev *rtwdev, struct ieee80211_hw *hw) hw->wiphy->max_scan_ssids = RTW_SCAN_MAX_SSIDS; hw->wiphy->max_scan_ie_len = rtw_get_max_scan_ie_len(rtwdev); - if (rtwdev->chip->id == RTW_CHIP_TYPE_8822C) { + if (!sta_mode_only && rtwdev->chip->id == RTW_CHIP_TYPE_8822C) { hw->wiphy->iface_combinations = rtw_iface_combs; hw->wiphy->n_iface_combinations = ARRAY_SIZE(rtw_iface_combs); }
Since only station mode has been tested on SDIO chips, only keep it support for SDIO chips to reflect correct supported features. Link: https://lore.kernel.org/linux-wireless/87wmpu1do6.fsf@kernel.org/T/#t Link: https://lore.kernel.org/linux-wireless/36972ff5-0c48-4bd2-8f9a-9649bfa24225@lexina.in/ Cc: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Signed-off-by: Ping-Ke Shih <pkshih@realtek.com> --- v2: correct subject prefix that should be "rtw88" instead of "rtw89" --- drivers/net/wireless/realtek/rtw88/main.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)