Commit 67de8acd authored by David S. Miller's avatar David S. Miller
Browse files

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



Johannes Berg says:

====================
A small set of fixes for
 * queue selection in mesh/ocb
 * queue handling on interface stop
 * hwsim virtio device vs. some other virtio changes
 * dt-bindings email addresses
 * color collision memory allocation
 * a const variable in rtw88
 * shared SKB transmit in the ethernet format path
 * P2P client port authorization
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 23aa6d50 50e2ab39

Documentation/devicetree/bindings/net/wireless/qca,ath9k.yaml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Qualcomm Atheros ath9k wireless devices Generic Binding



maintainers:

  - Kalle Valo <kvalo@codeaurora.org>

  - Toke Høiland-Jørgensen <toke@toke.dk>



description: |

  This node provides properties for configuring the ath9k wireless device.

Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Qualcomm Technologies ath11k wireless devices Generic Binding



maintainers:

  - Kalle Valo <kvalo@codeaurora.org>

  - Kalle Valo <kvalo@kernel.org>



description: |

  These are dt entries for Qualcomm Technologies, Inc. IEEE 802.11ax

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

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


	switch (ev->evt_type) {

	case WMI_BSS_COLOR_COLLISION_DETECTION:

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

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

						       GFP_KERNEL);

		ath11k_dbg(ab, ATH11K_DBG_WMI,

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

			   ev->vdev_id, ev->evt_type, ev->obss_color_bitmap);

drivers/net/wireless/mac80211_hwsim.c

+2 −0
Original line number Diff line number Diff line
@@ -4912,6 +4912,8 @@ static int hwsim_virtio_probe(struct virtio_device *vdev) 
	if (err)

		return err;



	virtio_device_ready(vdev);



	err = fill_vq(hwsim_vqs[HWSIM_VQ_RX]);

	if (err)

		goto out_remove;

drivers/net/wireless/realtek/rtw88/main.h

+3 −3
Original line number Diff line number Diff line
@@ -1233,9 +1233,6 @@ struct rtw_chip_info { 
	const struct wiphy_wowlan_support *wowlan_stub;

	const u8 max_sched_scan_ssids;



	/* for 8821c set channel */

	u32 ch_param[3];



	/* coex paras */

	u32 coex_para_ver;

	u8 bt_desired_ver;
@@ -1937,6 +1934,9 @@ struct rtw_hal { 


	enum rtw_sar_bands sar_band;

	struct rtw_sar sar;



	/* for 8821c set channel */

	u32 ch_param[3];

};



struct rtw_path_div {