| Message ID | 20191008082101.2494-7-yhchuang@realtek.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 5dc32b8ace3754fab7f1c504e6e5dac6d0f7686d |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | rtw88: minor throughput improvement | expand |
<yhchuang@realtek.com> wrote: > From: Tzu-En Huang <tehuang@realtek.com> > > Add support for NL80211_EXT_FEATURE_CAN_REPLACE_PTK0 feature. > According to the "Hardware crypto acceleration" documentation section, > when set_key() is called with %DISABLE_KEY command, for outgoing frames, > we flush out frames in the queues with the old key; for incoming frames, > no frames will be passed to mac80211 decrypted with the old key due to > rtw_sec_clear_cam(). > > Signed-off-by: Tzu-En Huang <tehuang@realtek.com> > Signed-off-by: Yan-Hsuan Chuang <yhchuang@realtek.com> 4 patches applied to wireless-drivers-next.git, thanks. 5dc32b8ace37 rtw88: add NL80211_EXT_FEATURE_CAN_REPLACE_PTK0 support a4835410995e rtw88: Use rtw_write8_set to set SYS_FUNC 474264d5a6b7 rtw88: pci: config phy after chip info is setup 12078aae4535 rtw88: coex: Set 4 slot mode for A2DP
diff --git a/drivers/net/wireless/realtek/rtw88/mac.h b/drivers/net/wireless/realtek/rtw88/mac.h index a67fa82973e4..592dc830160c 100644 --- a/drivers/net/wireless/realtek/rtw88/mac.h +++ b/drivers/net/wireless/realtek/rtw88/mac.h @@ -33,4 +33,9 @@ int rtw_download_firmware(struct rtw_dev *rtwdev, struct rtw_fw_state *fw); int rtw_mac_init(struct rtw_dev *rtwdev); void rtw_mac_flush_queues(struct rtw_dev *rtwdev, u32 queues, bool drop); +static inline void rtw_mac_flush_all_queues(struct rtw_dev *rtwdev, bool drop) +{ + rtw_mac_flush_queues(rtwdev, BIT(rtwdev->hw->queues) - 1, drop); +} + #endif diff --git a/drivers/net/wireless/realtek/rtw88/mac80211.c b/drivers/net/wireless/realtek/rtw88/mac80211.c index 3e4f2f27ced2..2247bd61e716 100644 --- a/drivers/net/wireless/realtek/rtw88/mac80211.c +++ b/drivers/net/wireless/realtek/rtw88/mac80211.c @@ -546,6 +546,7 @@ static int rtw_ops_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, hw_key_type, hw_key_idx); break; case DISABLE_KEY: + rtw_mac_flush_all_queues(rtwdev, false); rtw_sec_clear_cam(rtwdev, sec, key->hw_key_idx); break; } diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c index edd490c507b5..71f11c973307 100644 --- a/drivers/net/wireless/realtek/rtw88/main.c +++ b/drivers/net/wireless/realtek/rtw88/main.c @@ -1403,6 +1403,8 @@ int rtw_register_hw(struct rtw_dev *rtwdev, struct ieee80211_hw *hw) hw->wiphy->features |= NL80211_FEATURE_SCAN_RANDOM_MAC_ADDR; + wiphy_ext_feature_set(hw->wiphy, NL80211_EXT_FEATURE_CAN_REPLACE_PTK0); + rtw_set_supported_band(hw, rtwdev->chip); SET_IEEE80211_PERM_ADDR(hw, rtwdev->efuse.addr);