Commit 2baf8ba5 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'wireless-next-2022-07-25' of... 

Merge tag 'wireless-next-2022-07-25' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next

Kalle Valo says:

====================
wireless-next patches for v5.20

Third set of patches for v5.20. MLO work continues and we have a lot
of stack changes due to that, including driver API changes. Not much
driver patches except on mt76.

Major changes:

cfg80211/mac80211
 - more prepartion for Wi-Fi 7 Multi-Link Operation (MLO) support,
   works with one link now
 - align with IEEE Draft P802.11be_D2.0
 - hardware timestamps for receive and transmit

mt76
 - preparation for new chipset support
 - ACPI SAR support

* tag 'wireless-next-2022-07-25' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next: (254 commits)
  wifi: mac80211: fix link data leak
  wifi: mac80211: mlme: fix disassoc with MLO
  wifi: mac80211: add macros to loop over active links
  wifi: mac80211: remove erroneous sband/link validation
  wifi: mac80211: mlme: transmit assoc frame with address translation
  wifi: mac80211: verify link addresses are different
  wifi: mac80211: rx: track link in RX data
  wifi: mac80211: optionally implement MLO multicast TX
  wifi: mac80211: expand ieee80211_mgmt_tx() for MLO
  wifi: nl80211: add MLO link ID to the NL80211_CMD_FRAME TX API
  wifi: mac80211: report link ID to cfg80211 on mgmt RX
  wifi: cfg80211: report link ID in NL80211_CMD_FRAME
  wifi: mac80211: add hardware timestamps for RX and TX
  wifi: cfg80211: add hardware timestamps to frame RX info
  wifi: cfg80211/nl80211: move rx management data into a struct
  wifi: cfg80211: add a function for reporting TX status with hardware timestamps
  wifi: nl80211: add RX and TX timestamp attributes
  wifi: ieee80211: add helper functions for detecting TM/FTM frames
  wifi: mac80211_hwsim: handle links for wmediumd/virtio
  wifi: mac80211: sta_info: fix link_sta insertion
  ...
====================

Link: https://lore.kernel.org/r/20220725174547.EA465C341C6@smtp.kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 5030a9a0 9fab4cc8

Documentation/devicetree/bindings/net/wireless/mediatek,mt76.yaml

+13 −0
Original line number Diff line number Diff line
@@ -54,6 +54,16 @@ properties: 
  reset-names:

    const: consys



  clocks:

    maxItems: 2

    description:

      Specify the consys clocks for mt7986.



  clock-names:

    items:

      - const: mcu

      - const: ap2conn



  mediatek,infracfg:

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

    description:
@@ -269,5 +279,8 @@ examples: 
              <0x10003000 0x1000>,

              <0x11d10000 0x1000>;

        interrupts = <GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH>;

        clocks = <&topckgen 50>,

                 <&topckgen 62>;

        clock-names = "mcu", "ap2conn";

        memory-region = <&wmcpu_emi>;

    };

drivers/net/wireless/ath/ath10k/mac.c

+5 −4
Original line number Diff line number Diff line
@@ -6252,7 +6252,7 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw, 
	}



	if (changed & BSS_CHANGED_PS) {

		arvif->ps = vif->bss_conf.ps;

		arvif->ps = vif->cfg.ps;



		ret = ath10k_config_ps(ar);

		if (ret)
@@ -7814,7 +7814,8 @@ static int ath10k_conf_tx_uapsd(struct ath10k *ar, struct ieee80211_vif *vif, 
}



static int ath10k_conf_tx(struct ieee80211_hw *hw,

			  struct ieee80211_vif *vif, u16 ac,

			  struct ieee80211_vif *vif,

			  unsigned int link_id, u16 ac,

			  const struct ieee80211_tx_queue_params *params)

{

	struct ath10k *ar = hw->priv;
@@ -8919,7 +8920,7 @@ ath10k_mac_op_change_chanctx(struct ieee80211_hw *hw, 
static int

ath10k_mac_op_assign_vif_chanctx(struct ieee80211_hw *hw,

				 struct ieee80211_vif *vif,

				 unsigned int link_id,

				 struct ieee80211_bss_conf *link_conf,

				 struct ieee80211_chanctx_conf *ctx)

{

	struct ath10k *ar = hw->priv;
@@ -8999,7 +9000,7 @@ ath10k_mac_op_assign_vif_chanctx(struct ieee80211_hw *hw, 
static void

ath10k_mac_op_unassign_vif_chanctx(struct ieee80211_hw *hw,

				   struct ieee80211_vif *vif,

				   unsigned int link_id,

				   struct ieee80211_bss_conf *link_conf,

				   struct ieee80211_chanctx_conf *ctx)

{

	struct ath10k *ar = hw->priv;

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

+7 −5
Original line number Diff line number Diff line
@@ -1401,7 +1401,8 @@ void ath11k_mac_bcn_tx_event(struct ath11k_vif *arvif) 
	if (!vif->bss_conf.color_change_active && !arvif->bcca_zero_sent)

		return;



	if (vif->bss_conf.color_change_active && ieee80211_beacon_cntdwn_is_complete(vif)) {

	if (vif->bss_conf.color_change_active &&

	    ieee80211_beacon_cntdwn_is_complete(vif)) {

		arvif->bcca_zero_sent = true;

		ieee80211_color_change_finish(vif);

		return;
@@ -3292,7 +3293,7 @@ static void ath11k_mac_op_bss_info_changed(struct ieee80211_hw *hw, 


	if (changed & BSS_CHANGED_PS &&

	    ar->ab->hw_params.supports_sta_ps) {

		arvif->ps = vif->bss_conf.ps;

		arvif->ps = vif->cfg.ps;



		ret = ath11k_mac_config_ps(ar);

		if (ret)
@@ -4822,7 +4823,8 @@ static int ath11k_conf_tx_uapsd(struct ath11k *ar, struct ieee80211_vif *vif, 
}



static int ath11k_mac_op_conf_tx(struct ieee80211_hw *hw,

				 struct ieee80211_vif *vif, u16 ac,

				 struct ieee80211_vif *vif,

				 unsigned int link_id, u16 ac,

				 const struct ieee80211_tx_queue_params *params)

{

	struct ath11k *ar = hw->priv;
@@ -7072,7 +7074,7 @@ static int ath11k_start_vdev_delay(struct ieee80211_hw *hw, 
static int

ath11k_mac_op_assign_vif_chanctx(struct ieee80211_hw *hw,

				 struct ieee80211_vif *vif,

				 unsigned int link_id,

				 struct ieee80211_bss_conf *link_conf,

				 struct ieee80211_chanctx_conf *ctx)

{

	struct ath11k *ar = hw->priv;
@@ -7162,7 +7164,7 @@ ath11k_mac_op_assign_vif_chanctx(struct ieee80211_hw *hw, 
static void

ath11k_mac_op_unassign_vif_chanctx(struct ieee80211_hw *hw,

				   struct ieee80211_vif *vif,

				   unsigned int link_id,

				   struct ieee80211_bss_conf *link_conf,

				   struct ieee80211_chanctx_conf *ctx)

{

	struct ath11k *ar = hw->priv;

drivers/net/wireless/ath/ath5k/base.c

+1 −1
Original line number Diff line number Diff line
@@ -1982,7 +1982,7 @@ ath5k_beacon_send(struct ath5k_hw *ah) 


	/*

	 * Check if the previous beacon has gone out.  If

	 * not, don't don't try to post another: skip this

	 * not, don't try to post another: skip this

	 * period and wait for the next.  Missed beacons

	 * indicate a problem and should not occur.  If we

	 * miss too many consecutive beacons reset the device.

drivers/net/wireless/ath/ath5k/mac80211-ops.c

+3 −2
Original line number Diff line number Diff line
@@ -410,7 +410,7 @@ ath5k_configure_filter(struct ieee80211_hw *hw, unsigned int changed_flags, 
	/* FIF_CONTROL doc says we should only pass on control frames for this

	 * station. This needs testing. I believe right now this

	 * enables *all* control frames, which is OK.. but

	 * but we should see if we can improve on granularity */

	 * we should see if we can improve on granularity */

	if (*new_flags & FIF_CONTROL)

		rfilt |= AR5K_RX_FILTER_CONTROL;
@@ -572,7 +572,8 @@ ath5k_get_stats(struct ieee80211_hw *hw, 




static int

ath5k_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, u16 queue,

ath5k_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

	      unsigned int link_id, u16 queue,

	      const struct ieee80211_tx_queue_params *params)

{

	struct ath5k_hw *ah = hw->priv;