Commit 643952f3 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'wireless-next-2022-08-26-v2' of... 

Merge tag 'wireless-next-2022-08-26-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next



Johannes berg says:

====================
Various updates:
 * rtw88: operation, locking, warning, and code style fixes
 * rtw89: small updates
 * cfg80211/mac80211: more EHT/MLO (802.11be, WiFi 7) work
 * brcmfmac: a couple of fixes
 * misc cleanups etc.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 76d7df94 4ffb4d25

Documentation/devicetree/bindings/net/wireless/microchip,wilc1000.yaml

+4 −3
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ properties: 


  reg: true



  spi-max-frequency: true



  interrupts:

    maxItems: 1
@@ -51,7 +49,10 @@ required: 
  - compatible

  - interrupts



additionalProperties: false

allOf:

  - $ref: /schemas/spi/spi-peripheral-props.yaml#



unevaluatedProperties: false



examples:

  - |

Documentation/devicetree/bindings/net/wireless/silabs,wfx.yaml

+5 −10
Original line number Diff line number Diff line
@@ -29,12 +29,6 @@ description: > 
    Documentation/devicetree/bindings/mmc/mmc-pwrseq-simple.yaml for more

    information.



  For SPI:



    In add of the properties below, please consult

    Documentation/devicetree/bindings/spi/spi-controller.yaml for optional SPI

    related properties.



properties:

  compatible:

    items:
@@ -52,8 +46,6 @@ properties: 
      bindings.

    maxItems: 1



  spi-max-frequency: true



  interrupts:

    description: The interrupt line. Should be IRQ_TYPE_EDGE_RISING. When SPI is

      used, this property is required. When SDIO is used, the "in-band"
@@ -84,12 +76,15 @@ properties: 


  mac-address: true



additionalProperties: false



required:

  - compatible

  - reg



allOf:

  - $ref: /schemas/spi/spi-peripheral-props.yaml#



unevaluatedProperties: false



examples:

  - |

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

Documentation/devicetree/bindings/net/wireless/ti,wlcore.yaml

+16 −16
Original line number Diff line number Diff line
@@ -36,8 +36,6 @@ properties: 
      This is required when connected via SPI, and optional when connected via

      SDIO.



  spi-max-frequency: true



  interrupts:

    minItems: 1

    maxItems: 2
@@ -69,7 +67,9 @@ required: 
  - compatible

  - interrupts



if:

allOf:

  - $ref: /schemas/spi/spi-peripheral-props.yaml#

  - if:

      properties:

        compatible:

          contains:
@@ -82,7 +82,7 @@ then: 
      required:

        - ref-clock-frequency



additionalProperties: false

unevaluatedProperties: false



examples:

  - |

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

+4 −4
Original line number Diff line number Diff line
@@ -1124,7 +1124,7 @@ void ath6kl_cfg80211_ch_switch_notify(struct ath6kl_vif *vif, int freq, 
}



static int ath6kl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev,

				   u8 key_index, bool pairwise,

				   int link_id, u8 key_index, bool pairwise,

				   const u8 *mac_addr,

				   struct key_params *params)

{
@@ -1249,7 +1249,7 @@ static int ath6kl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev, 
}



static int ath6kl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *ndev,

				   u8 key_index, bool pairwise,

				   int link_id, u8 key_index, bool pairwise,

				   const u8 *mac_addr)

{

	struct ath6kl *ar = ath6kl_priv(ndev);
@@ -1279,7 +1279,7 @@ static int ath6kl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *ndev, 
}



static int ath6kl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *ndev,

				   u8 key_index, bool pairwise,

				   int link_id, u8 key_index, bool pairwise,

				   const u8 *mac_addr, void *cookie,

				   void (*callback) (void *cookie,

						     struct key_params *))
@@ -1314,7 +1314,7 @@ static int ath6kl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *ndev, 
}



static int ath6kl_cfg80211_set_default_key(struct wiphy *wiphy,

					   struct net_device *ndev,

					   struct net_device *ndev, int link_id,

					   u8 key_index, bool unicast,

					   bool multicast)

{

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

+5 −5
Original line number Diff line number Diff line
@@ -1620,7 +1620,7 @@ static void wil_del_rx_key(u8 key_index, enum wmi_key_usage key_usage, 
}



static int wil_cfg80211_add_key(struct wiphy *wiphy,

				struct net_device *ndev,

				struct net_device *ndev, int link_id,

				u8 key_index, bool pairwise,

				const u8 *mac_addr,

				struct key_params *params)
@@ -1696,7 +1696,7 @@ static int wil_cfg80211_add_key(struct wiphy *wiphy, 
}



static int wil_cfg80211_del_key(struct wiphy *wiphy,

				struct net_device *ndev,

				struct net_device *ndev, int link_id,

				u8 key_index, bool pairwise,

				const u8 *mac_addr)

{
@@ -1723,7 +1723,7 @@ static int wil_cfg80211_del_key(struct wiphy *wiphy, 


/* Need to be present or wiphy_new() will WARN */

static int wil_cfg80211_set_default_key(struct wiphy *wiphy,

					struct net_device *ndev,

					struct net_device *ndev, int link_id,

					u8 key_index, bool unicast,

					bool multicast)

{
@@ -2072,8 +2072,8 @@ void wil_cfg80211_ap_recovery(struct wil6210_priv *wil) 
		key_params.key = vif->gtk;

		key_params.key_len = vif->gtk_len;

		key_params.seq_len = IEEE80211_GCMP_PN_LEN;

		rc = wil_cfg80211_add_key(wiphy, ndev, vif->gtk_index, false,

					  NULL, &key_params);

		rc = wil_cfg80211_add_key(wiphy, ndev, -1, vif->gtk_index,

					  false, NULL, &key_params);

		if (rc)

			wil_err(wil, "vif %d recovery add key failed (%d)\n",

				i, rc);