Commit 71f8992e authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'wireless-next-2025-03-04-v2' of... 

Merge tag 'wireless-next-2025-03-04-v2' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next

Johannes Berg says:

====================
First 6.15 material:
 * cfg80211/mac80211
   - remove cooked monitor support
   - strict mode for better AP testing
   - basic EPCS support
   - OMI RX bandwidth reduction support
 * rtw88
   - preparation for RTL8814AU support
 * rtw89
   - use wiphy_lock/wiphy_work
   - preparations for MLO
   - BT-Coex improvements
   - regulatory support in firmware files
 * iwlwifi
   - preparations for the new iwlmld sub-driver

* tag 'wireless-next-2025-03-04-v2' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next: (128 commits)
  wifi: iwlwifi: remove mld/roc.c
  wifi: mac80211: refactor populating mesh related fields in sinfo
  wifi: cfg80211: reorg sinfo structure elements for mesh
  wifi: iwlwifi: Fix spelling mistake "Increate" -> "Increase"
  wifi: iwlwifi: add Debug Host Command APIs
  wifi: iwlwifi: add IWL_MAX_NUM_IGTKS macro
  wifi: iwlwifi: add OMI bandwidth reduction APIs
  wifi: iwlwifi: remove mvm prefix from iwl_mvm_d3_end_notif
  wifi: iwlwifi: remember if the UATS table was read successfully
  wifi: iwlwifi: export iwl_get_lari_config_bitmap
  wifi: iwlwifi: add support for external 32 KHz clock
  wifi: iwlwifi: mld: add a debug level for EHT prints
  wifi: iwlwifi: mld: add a debug level for PTP prints
  wifi: iwlwifi: remove mvm prefix from iwl_mvm_esr_mode_notif
  wifi: iwlwifi: use 0xff instead of 0xffffffff for invalid
  wifi: iwlwifi: location api cleanup
  wifi: cfg80211: expose update timestamp to drivers
  wifi: mac80211: add ieee80211_iter_chan_contexts_mtx
  wifi: mac80211: fix integer overflow in hwmp_route_info_get()
  wifi: mac80211: Fix possible integer promotion issue
  ...
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 5b629961 799b7f93

Documentation/devicetree/bindings/net/rfkill-gpio.yaml

+5 −0
Original line number Diff line number Diff line
@@ -32,6 +32,10 @@ properties: 
  shutdown-gpios:

    maxItems: 1



  default-blocked:

    $ref: /schemas/types.yaml#/definitions/flag

    description: configure rfkill state as blocked at boot



required:

  - compatible

  - radio-type
@@ -48,4 +52,5 @@ examples: 
        label = "rfkill-pcie-wlan";

        radio-type = "wlan";

        shutdown-gpios = <&gpio2 25 GPIO_ACTIVE_HIGH>;

        default-blocked;

    };

drivers/net/wireless/broadcom/b43/main.c

+1 −1
Original line number Diff line number Diff line
@@ -2166,7 +2166,7 @@ static void b43_print_fw_helptext(struct b43_wl *wl, bool error) 
{

	const char text[] =

		"You must go to " \

		"https://wireless.wiki.kernel.org/en/users/Drivers/b43#devicefirmware " \

		"https://wireless.docs.kernel.org/en/latest/en/users/drivers/b43/developers.html#list-of-firmware " \

		"and download the correct firmware for this driver version. " \

		"Please carefully read all instructions on this website.\n";

drivers/net/wireless/intel/ipw2x00/ipw2200.c

+1 −1
Original line number Diff line number Diff line
@@ -3295,7 +3295,7 @@ static int ipw_init_nic(struct ipw_priv *priv) 
	rc = ipw_poll_bit(priv, IPW_GP_CNTRL_RW,

			  IPW_GP_CNTRL_BIT_CLOCK_READY, 250);

	if (rc < 0)

		IPW_DEBUG_INFO("FAILED wait for clock stablization\n");

		IPW_DEBUG_INFO("FAILED wait for clock stabilization\n");



	/* assert SW reset */

	ipw_set_bit(priv, IPW_RESET_REG, IPW_RESET_REG_SW_RESET);

drivers/net/wireless/intel/ipw2x00/libipw.h

+0 −2
Original line number Diff line number Diff line
@@ -1011,8 +1011,6 @@ netdev_tx_t libipw_xmit(struct sk_buff *skb, struct net_device *dev); 
void libipw_txb_free(struct libipw_txb *);



/* libipw_rx.c */

void libipw_rx_any(struct libipw_device *ieee, struct sk_buff *skb,

		   struct libipw_rx_stats *stats);

int libipw_rx(struct libipw_device *ieee, struct sk_buff *skb,

	      struct libipw_rx_stats *rx_stats);

/* make sure to set stats->len */

drivers/net/wireless/intel/ipw2x00/libipw_rx.c

+0 −91
Original line number Diff line number Diff line
@@ -823,96 +823,6 @@ int libipw_rx(struct libipw_device *ieee, struct sk_buff *skb, 
	return 0;

}



/* Filter out unrelated packets, call libipw_rx[_mgt]

 * This function takes over the skb, it should not be used again after calling

 * this function. */

void libipw_rx_any(struct libipw_device *ieee,

		     struct sk_buff *skb, struct libipw_rx_stats *stats)

{

	struct libipw_hdr_4addr *hdr;

	int is_packet_for_us;

	u16 fc;



	if (ieee->iw_mode == IW_MODE_MONITOR) {

		if (!libipw_rx(ieee, skb, stats))

			dev_kfree_skb_irq(skb);

		return;

	}



	if (skb->len < sizeof(struct ieee80211_hdr))

		goto drop_free;



	hdr = (struct libipw_hdr_4addr *)skb->data;

	fc = le16_to_cpu(hdr->frame_ctl);



	if ((fc & IEEE80211_FCTL_VERS) != 0)

		goto drop_free;



	switch (fc & IEEE80211_FCTL_FTYPE) {

	case IEEE80211_FTYPE_MGMT:

		if (skb->len < sizeof(struct libipw_hdr_3addr))

			goto drop_free;

		libipw_rx_mgt(ieee, hdr, stats);

		dev_kfree_skb_irq(skb);

		return;

	case IEEE80211_FTYPE_DATA:

		break;

	case IEEE80211_FTYPE_CTL:

		return;

	default:

		return;

	}



	is_packet_for_us = 0;

	switch (ieee->iw_mode) {

	case IW_MODE_ADHOC:

		/* our BSS and not from/to DS */

		if (ether_addr_equal(hdr->addr3, ieee->bssid) &&

		    ((fc & (IEEE80211_FCTL_TODS + IEEE80211_FCTL_FROMDS)) == 0)) {

			/* promisc: get all */

			if (ieee->dev->flags & IFF_PROMISC)

				is_packet_for_us = 1;

			/* to us */

			else if (ether_addr_equal(hdr->addr1, ieee->dev->dev_addr))

				is_packet_for_us = 1;

			/* mcast */

			else if (is_multicast_ether_addr(hdr->addr1))

				is_packet_for_us = 1;

		}

		break;

	case IW_MODE_INFRA:

		/* our BSS (== from our AP) and from DS */

		if (ether_addr_equal(hdr->addr2, ieee->bssid) &&

		    ((fc & (IEEE80211_FCTL_TODS + IEEE80211_FCTL_FROMDS)) == IEEE80211_FCTL_FROMDS)) {

			/* promisc: get all */

			if (ieee->dev->flags & IFF_PROMISC)

				is_packet_for_us = 1;

			/* to us */

			else if (ether_addr_equal(hdr->addr1, ieee->dev->dev_addr))

				is_packet_for_us = 1;

			/* mcast */

			else if (is_multicast_ether_addr(hdr->addr1)) {

				/* not our own packet bcasted from AP */

				if (!ether_addr_equal(hdr->addr3, ieee->dev->dev_addr))

					is_packet_for_us = 1;

			}

		}

		break;

	default:

		/* ? */

		break;

	}



	if (is_packet_for_us)

		if (!libipw_rx(ieee, skb, stats))

			dev_kfree_skb_irq(skb);

	return;



drop_free:

	dev_kfree_skb_irq(skb);

	ieee->dev->stats.rx_dropped++;

}



#define MGMT_FRAME_FIXED_PART_LENGTH		0x24



static u8 qos_oui[QOS_OUI_LEN] = { 0x00, 0x50, 0xF2 };
@@ -1729,6 +1639,5 @@ void libipw_rx_mgt(struct libipw_device *ieee, 
	}

}



EXPORT_SYMBOL_GPL(libipw_rx_any);

EXPORT_SYMBOL(libipw_rx_mgt);

EXPORT_SYMBOL(libipw_rx);