Commit 62be6939 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'wireless-next-2023-01-23' of... 

Merge tag 'wireless-next-2023-01-23' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next

Kalle Valo says:

====================
wireless-next patches for v6.3

First set of patches for v6.3. The most important change here is that
the old Wireless Extension user space interface is not supported on
Wi-Fi 7 devices at all. We also added a warning if anyone with modern
drivers (ie. cfg80211 and mac80211 drivers) tries to use Wireless
Extensions, everyone should switch to using nl80211 interface instead.

Static WEP support is removed, there wasn't any driver using that
anyway so there's no user impact. Otherwise it's smaller features and
fixes as usual.

Note: As mt76 had tricky conflicts due to the fixes in wireless tree,
we decided to merge wireless into wireless-next to solve them easily.
There should not be any merge problems anymore.

Major changes:

cfg80211
 - remove never used static WEP support
 - warn if Wireless Extention interface is used with cfg80211/mac80211 drivers
 - stop supporting Wireless Extensions with Wi-Fi 7 devices
 - support minimal Wi-Fi 7 Extremely High Throughput (EHT) rate reporting

rfkill
 - add GPIO DT support

bitfield
 - add FIELD_PREP_CONST()

mt76
 - per-PHY LED support

rtw89
 - support new Bluetooth co-existance version

rtl8xxxu
 - support RTL8188EU

* tag 'wireless-next-2023-01-23' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next: (123 commits)
  wifi: wireless: deny wireless extensions on MLO-capable devices
  wifi: wireless: warn on most wireless extension usage
  wifi: mac80211: drop extra 'e' from ieeee80211... name
  wifi: cfg80211: Deduplicate certificate loading
  bitfield: add FIELD_PREP_CONST()
  wifi: mac80211: add kernel-doc for EHT structure
  mac80211: support minimal EHT rate reporting on RX
  wifi: mac80211: Add HE MU-MIMO related flags in ieee80211_bss_conf
  wifi: mac80211: Add VHT MU-MIMO related flags in ieee80211_bss_conf
  wifi: cfg80211: Use MLD address to indicate MLD STA disconnection
  wifi: cfg80211: Support 32 bytes KCK key in GTK rekey offload
  wifi: cfg80211: Fix extended KCK key length check in nl80211_set_rekey_data()
  wifi: cfg80211: remove support for static WEP
  wifi: rtl8xxxu: Dump the efuse only for untested devices
  wifi: rtl8xxxu: Print the ROM version too
  wifi: rtw88: Use non-atomic sta iterator in rtw_ra_mask_info_update()
  wifi: rtw88: Use rtw_iterate_vifs() for rtw_vif_watch_dog_iter()
  wifi: rtw88: Move register access from rtw_bf_assoc() outside the RCU
  wifi: rtl8xxxu: Use a longer retry limit of 48
  wifi: rtl8xxxu: Report the RSSI to the firmware
  ...
====================

Link: https://lore.kernel.org/r/20230123103338.330CBC433EF@smtp.kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 306f2082 4ca69027

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

0 → 100644
+51 −0
Original line number Original line Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/net/rfkill-gpio.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: GPIO controlled rfkill switch



maintainers:

  - Johannes Berg <johannes@sipsolutions.net>

  - Philipp Zabel <p.zabel@pengutronix.de>



properties:

  compatible:

    const: rfkill-gpio



  label:

    description: rfkill switch name, defaults to node name



  radio-type:

    description: rfkill radio type

    enum:

      - bluetooth

      - fm

      - gps

      - nfc

      - ultrawideband

      - wimax

      - wlan

      - wwan



  shutdown-gpios:

    maxItems: 1



required:

  - compatible

  - radio-type

  - shutdown-gpios



additionalProperties: false



examples:

  - |

    #include <dt-bindings/gpio/gpio.h>



    rfkill {

        compatible = "rfkill-gpio";

        label = "rfkill-pcie-wlan";

        radio-type = "wlan";

        shutdown-gpios = <&gpio2 25 GPIO_ACTIVE_HIGH>;

    };

crypto/asymmetric_keys/x509_loader.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -55,3 +55,4 @@ int x509_load_certificate_list(const u8 cert_list[], 
	pr_err("Problem parsing in-kernel X.509 certificate list\n");

	pr_err("Problem parsing in-kernel X.509 certificate list\n");

	return 0;

	return 0;

}

}

EXPORT_SYMBOL_GPL(x509_load_certificate_list);

drivers/net/wireless/ath/ath11k/wmi.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -3853,7 +3853,7 @@ ath11k_wmi_obss_color_collision_event(struct ath11k_base *ab, struct sk_buff *sk 




	switch (ev->evt_type) {

	switch (ev->evt_type) {

	case WMI_BSS_COLOR_COLLISION_DETECTION:

	case WMI_BSS_COLOR_COLLISION_DETECTION:

		ieeee80211_obss_color_collision_notify(arvif->vif, ev->obss_color_bitmap,

		ieee80211_obss_color_collision_notify(arvif->vif, ev->obss_color_bitmap,

						      GFP_KERNEL);

						      GFP_KERNEL);

		ath11k_dbg(ab, ATH11K_DBG_WMI,

		ath11k_dbg(ab, ATH11K_DBG_WMI,

			   "OBSS color collision detected vdev:%d, event:%d, bitmap:%08llx\n",

			   "OBSS color collision detected vdev:%d, event:%d, bitmap:%08llx\n",

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

+5 −2
Original line number Original line Diff line number Diff line
@@ -299,6 +299,7 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp) 
			 err);

			 err);

		goto done;

		goto done;

	}

	}

	buf[sizeof(buf) - 1] = '\0';

	ptr = (char *)buf;

	ptr = (char *)buf;

	strsep(&ptr, "\n");

	strsep(&ptr, "\n");
@@ -319,15 +320,17 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp) 
	if (err) {

	if (err) {

		brcmf_dbg(TRACE, "retrieving clmver failed, %d\n", err);

		brcmf_dbg(TRACE, "retrieving clmver failed, %d\n", err);

	} else {

	} else {

		buf[sizeof(buf) - 1] = '\0';

		clmver = (char *)buf;

		clmver = (char *)buf;

		/* store CLM version for adding it to revinfo debugfs file */

		memcpy(ifp->drvr->clmver, clmver, sizeof(ifp->drvr->clmver));





		/* Replace all newline/linefeed characters with space

		/* Replace all newline/linefeed characters with space

		 * character

		 * character

		 */

		 */

		strreplace(clmver, '\n', ' ');

		strreplace(clmver, '\n', ' ');





		/* store CLM version for adding it to revinfo debugfs file */

		memcpy(ifp->drvr->clmver, clmver, sizeof(ifp->drvr->clmver));



		brcmf_dbg(INFO, "CLM version = %s\n", clmver);

		brcmf_dbg(INFO, "CLM version = %s\n", clmver);

	}

	}

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -336,6 +336,7 @@ static netdev_tx_t brcmf_netdev_start_xmit(struct sk_buff *skb, 
			bphy_err(drvr, "%s: failed to expand headroom\n",

			bphy_err(drvr, "%s: failed to expand headroom\n",

				 brcmf_ifname(ifp));

				 brcmf_ifname(ifp));

			atomic_inc(&drvr->bus_if->stats.pktcow_failed);

			atomic_inc(&drvr->bus_if->stats.pktcow_failed);

			dev_kfree_skb(skb);

			goto done;

			goto done;

		}

		}

	}

	}