Commit d103f26a authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'wireless-next-2025-09-11' of... 

Merge tag 'wireless-next-2025-09-11' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next

Johannes Berg says:

====================
Plenty of things going on, notably:
 - iwlwifi: major cleanups/rework
 - brcmfmac: gets AP isolation support
 - mac80211: gets more S1G support

* tag 'wireless-next-2025-09-11' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next: (94 commits)
  wifi: mwifiex: fix endianness handling in mwifiex_send_rgpower_table
  wifi: cfg80211: Remove the redundant wiphy_dev
  wifi: mac80211: fix incorrect comment
  wifi: cfg80211: update the time stamps in hidden ssid
  wifi: mac80211: Fix HE capabilities element check
  wifi: mac80211: add tx_handlers_drop statistics to ethtool
  wifi: mac80211: fix reporting of all valid links in sta_set_sinfo()
  wifi: iwlwifi: mld: CHANNEL_SURVEY_NOTIF is always supported
  wifi: iwlwifi: mld: remove support of iwl_esr_mode_notif version 1
  wifi: iwlwifi: mld: remove support from of sta cmd version 1
  wifi: iwlwifi: mld: remove support of roc cmd version 5
  wifi: iwlwifi: mld: remove support of mac cmd ver 2
  wifi: iwlwifi: mld: don't consider phy cmd version 5
  wifi: iwlwifi: implement wowlan status notification API update
  wifi: iwlwifi: fw: Add ASUS to PPAG and TAS list
  wifi: iwlwifi: add kunit tests for nvm parse
  wifi: iwlwifi: api: add a flag to iwl_link_ctx_modify_flags
  wifi: iwlwifi: pcie: move ltr_enabled to the specific transport
  wifi: iwlwifi: pcie: move pm_support to the specific transport
  wifi: iwlwifi: rename iwl_finish_nic_init
  ...
====================

Link: https://patch.msgid.link/20250911100854.20445-3-johannes@sipsolutions.net


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents fc3a2810 1b2e9feb

drivers/net/wireless/ath/carl9170/rx.c

+1 −1
Original line number Diff line number Diff line
@@ -555,7 +555,7 @@ static void carl9170_ps_beacon(struct ar9170 *ar, void *data, unsigned int len) 
	/* Check whenever the PHY can be turned off again. */



	/* 1. What about buffered unicast traffic for our AID? */

	cam = ieee80211_check_tim(tim_ie, tim_len, ar->common.curaid);

	cam = ieee80211_check_tim(tim_ie, tim_len, ar->common.curaid, false);



	/* 2. Maybe the AP wants to send multicast/broadcast data? */

	cam |= !!(tim_ie->bitmap_ctrl & 0x01);

drivers/net/wireless/ath/wil6210/cfg80211.c

+1 −0
Original line number Diff line number Diff line
@@ -2708,6 +2708,7 @@ static void wil_wiphy_init(struct wiphy *wiphy) 
	wiphy->n_cipher_suites = ARRAY_SIZE(wil_cipher_suites);

	wiphy->mgmt_stypes = wil_mgmt_stypes;

	wiphy->features |= NL80211_FEATURE_SK_TX_STATUS;

	wiphy->bss_param_support = WIPHY_BSS_PARAM_AP_ISOLATE;



	wiphy->n_vendor_commands = ARRAY_SIZE(wil_nl80211_vendor_commands);

	wiphy->vendor_commands = wil_nl80211_vendor_commands;

drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c

+1 −1
Original line number Diff line number Diff line
@@ -997,9 +997,9 @@ static const struct sdio_device_id brcmf_sdmmc_ids[] = { 
	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4356, WCC),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4359, WCC),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43751, WCC),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43752, WCC),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_4373, CYW),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_43012, CYW),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_43752, CYW),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_89359, CYW),

	CYW_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_43439, CYW),

	{ /* end: all zeroes */ }

drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c

+23 −0
Original line number Diff line number Diff line
@@ -5958,6 +5958,26 @@ static int brcmf_cfg80211_del_pmk(struct wiphy *wiphy, struct net_device *dev, 
	return brcmf_set_pmk(ifp, NULL, 0);

}



static int brcmf_cfg80211_change_bss(struct wiphy *wiphy, struct net_device *dev,

				     struct bss_parameters *params)

{

	struct brcmf_if *ifp = netdev_priv(dev);

	int ret = 0;



	/* In AP mode, the "ap_isolate" value represents

	 *  0 = allow low-level bridging of frames between associated stations

	 *  1 = restrict low-level bridging of frames to isolate associated stations

	 * -1 = do not change existing setting

	 */

	if (params->ap_isolate >= 0) {

		ret = brcmf_fil_iovar_int_set(ifp, "ap_isolate", params->ap_isolate);

		if (ret < 0)

			brcmf_err("ap_isolate iovar failed: ret=%d\n", ret);

	}



	return ret;

}



static struct cfg80211_ops brcmf_cfg80211_ops = {

	.add_virtual_intf = brcmf_cfg80211_add_iface,

	.del_virtual_intf = brcmf_cfg80211_del_iface,
@@ -6005,6 +6025,7 @@ static struct cfg80211_ops brcmf_cfg80211_ops = { 
	.update_connect_params = brcmf_cfg80211_update_conn_params,

	.set_pmk = brcmf_cfg80211_set_pmk,

	.del_pmk = brcmf_cfg80211_del_pmk,

	.change_bss = brcmf_cfg80211_change_bss,

};



struct cfg80211_ops *brcmf_cfg80211_get_ops(struct brcmf_mp_device *settings)
@@ -7659,6 +7680,8 @@ static int brcmf_setup_wiphy(struct wiphy *wiphy, struct brcmf_if *ifp) 
				    BIT(NL80211_BSS_SELECT_ATTR_BAND_PREF) |

				    BIT(NL80211_BSS_SELECT_ATTR_RSSI_ADJUST);



	wiphy->bss_param_support = WIPHY_BSS_PARAM_AP_ISOLATE;



	wiphy->flags |= WIPHY_FLAG_NETNS_OK |

			WIPHY_FLAG_PS_ON_BY_DEFAULT |

			WIPHY_FLAG_HAVE_AP_SME |

drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c

+2 −2
Original line number Diff line number Diff line
@@ -738,8 +738,8 @@ static u32 brcmf_chip_tcm_rambase(struct brcmf_chip_priv *ci) 
	case BRCM_CC_4364_CHIP_ID:

	case CY_CC_4373_CHIP_ID:

		return 0x160000;

	case CY_CC_43752_CHIP_ID:

	case BRCM_CC_43751_CHIP_ID:

	case BRCM_CC_43752_CHIP_ID:

	case BRCM_CC_4377_CHIP_ID:

		return 0x170000;

	case BRCM_CC_4378_CHIP_ID:
@@ -1452,7 +1452,7 @@ bool brcmf_chip_sr_capable(struct brcmf_chip *pub) 
		return (reg & CC_SR_CTL0_ENABLE_MASK) != 0;

	case BRCM_CC_4359_CHIP_ID:

	case BRCM_CC_43751_CHIP_ID:

	case CY_CC_43752_CHIP_ID:

	case BRCM_CC_43752_CHIP_ID:

	case CY_CC_43012_CHIP_ID:

		addr = CORE_CC_REG(pmu->base, retention_ctl);

		reg = chip->ops->read32(chip->ctx, addr);