mirror of
https://github.com/linux-msm/laptops-kernel.git
synced 2026-08-13 14:19:53 -07:00
wifi: cfg80211: remove WIPHY_FLAG_DISABLE_WEXT
There are only two drivers left setting it, but they're both also setting WIPHY_FLAG_SUPPORTS_MLO for the relevant devices, so we can now remove WIPHY_FLAG_DISABLE_WEXT. Link: https://patch.msgid.link/20260619142107.150f1bbe3b83.I9ff3d419bad54313c76fa4c3485148c122e67fb3@changeid Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
@@ -14871,12 +14871,6 @@ static int ath12k_mac_hw_register(struct ath12k_hw *ah)
|
||||
|
||||
wiphy->features |= NL80211_FEATURE_TX_POWER_INSERTION;
|
||||
|
||||
/* MLO is not yet supported so disable Wireless Extensions for now
|
||||
* to make sure ath12k users don't use it. This flag can be removed
|
||||
* once WIPHY_FLAG_SUPPORTS_MLO is enabled.
|
||||
*/
|
||||
wiphy->flags |= WIPHY_FLAG_DISABLE_WEXT;
|
||||
|
||||
/* Copy over MLO related capabilities received from
|
||||
* WMI_SERVICE_READY_EXT2_EVENT if single_chip_mlo_supp is set.
|
||||
*/
|
||||
|
||||
@@ -7432,9 +7432,6 @@ static int rtw89_core_register_hw(struct rtw89_dev *rtwdev)
|
||||
if (!chip->support_rnr)
|
||||
hw->wiphy->flags |= WIPHY_FLAG_SPLIT_SCAN_6GHZ;
|
||||
|
||||
if (chip->chip_gen == RTW89_CHIP_BE)
|
||||
hw->wiphy->flags |= WIPHY_FLAG_DISABLE_WEXT;
|
||||
|
||||
if (rtwdev->support_mlo) {
|
||||
hw->wiphy->flags |= WIPHY_FLAG_SUPPORTS_MLO;
|
||||
hw->wiphy->iftype_ext_capab = rtw89_iftypes_ext_capa;
|
||||
|
||||
@@ -5690,7 +5690,6 @@ struct cfg80211_ops {
|
||||
* set this flag to update channels on beacon hints.
|
||||
* @WIPHY_FLAG_SUPPORTS_NSTR_NONPRIMARY: support connection to non-primary link
|
||||
* of an NSTR mobile AP MLD.
|
||||
* @WIPHY_FLAG_DISABLE_WEXT: disable wireless extensions for this device
|
||||
*/
|
||||
enum wiphy_flags {
|
||||
WIPHY_FLAG_SUPPORTS_EXT_KEK_KCK = BIT(0),
|
||||
@@ -5702,7 +5701,7 @@ enum wiphy_flags {
|
||||
WIPHY_FLAG_4ADDR_STATION = BIT(6),
|
||||
WIPHY_FLAG_CONTROL_PORT_PROTOCOL = BIT(7),
|
||||
WIPHY_FLAG_IBSS_RSN = BIT(8),
|
||||
WIPHY_FLAG_DISABLE_WEXT = BIT(9),
|
||||
/* reuse bit 9 */
|
||||
WIPHY_FLAG_MESH_AUTH = BIT(10),
|
||||
WIPHY_FLAG_SUPPORTS_EXT_KCK_32 = BIT(11),
|
||||
WIPHY_FLAG_SUPPORTS_NSTR_NONPRIMARY = BIT(12),
|
||||
|
||||
@@ -660,8 +660,7 @@ struct iw_statistics *get_wireless_stats(struct net_device *dev)
|
||||
dev->ieee80211_ptr->wiphy->wext &&
|
||||
dev->ieee80211_ptr->wiphy->wext->get_wireless_stats) {
|
||||
wireless_warn_cfg80211_wext();
|
||||
if (dev->ieee80211_ptr->wiphy->flags & (WIPHY_FLAG_SUPPORTS_MLO |
|
||||
WIPHY_FLAG_DISABLE_WEXT))
|
||||
if (dev->ieee80211_ptr->wiphy->flags & WIPHY_FLAG_SUPPORTS_MLO)
|
||||
return NULL;
|
||||
return dev->ieee80211_ptr->wiphy->wext->get_wireless_stats(dev);
|
||||
}
|
||||
@@ -703,8 +702,7 @@ static iw_handler get_handler(struct net_device *dev, unsigned int cmd)
|
||||
#ifdef CONFIG_CFG80211_WEXT
|
||||
if (dev->ieee80211_ptr && dev->ieee80211_ptr->wiphy) {
|
||||
wireless_warn_cfg80211_wext();
|
||||
if (dev->ieee80211_ptr->wiphy->flags & (WIPHY_FLAG_SUPPORTS_MLO |
|
||||
WIPHY_FLAG_DISABLE_WEXT))
|
||||
if (dev->ieee80211_ptr->wiphy->flags & WIPHY_FLAG_SUPPORTS_MLO)
|
||||
return NULL;
|
||||
handlers = dev->ieee80211_ptr->wiphy->wext;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user