Commit 6d4ff8ae authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'wireless-next-2023-05-12' of... 

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



Kalle valo says:

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

The first pull request for v6.5 and only driver changes this time.
rtl8xxxu has been making lots of progress lately and now has AP mode
support.

Major changes:

rtl8xxxu

* AP mode support, initially only for rtl8188f

rtw89

* provide RSSI, EVN and SNR statistics via debugfs

* support U-NII-4 channels on 5 GHz band
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents befcc1fc 8130e94e

drivers/net/wireless/marvell/mwifiex/11n.h

+2 −2
Original line number Diff line number Diff line
@@ -102,14 +102,14 @@ static inline u8 mwifiex_space_avail_for_new_ba_stream( 
{

	struct mwifiex_private *priv;

	u8 i;

	u32 ba_stream_num = 0, ba_stream_max;

	size_t ba_stream_num = 0, ba_stream_max;



	ba_stream_max = MWIFIEX_MAX_TX_BASTREAM_SUPPORTED;



	for (i = 0; i < adapter->priv_num; i++) {

		priv = adapter->priv[i];

		if (priv)

			ba_stream_num += mwifiex_wmm_list_len(

			ba_stream_num += list_count_nodes(

				&priv->tx_ba_stream_tbl_ptr);

	}

drivers/net/wireless/marvell/mwifiex/scan.c

+3 −3
Original line number Diff line number Diff line
@@ -2187,9 +2187,9 @@ int mwifiex_ret_802_11_scan(struct mwifiex_private *priv, 


	if (nd_config) {

		adapter->nd_info =

			kzalloc(sizeof(struct cfg80211_wowlan_nd_match) +

				sizeof(struct cfg80211_wowlan_nd_match *) *

				scan_rsp->number_of_sets, GFP_ATOMIC);

			kzalloc(struct_size(adapter->nd_info, matches,

					    scan_rsp->number_of_sets),

				GFP_ATOMIC);



		if (adapter->nd_info)

			adapter->nd_info->n_matches = scan_rsp->number_of_sets;

drivers/net/wireless/marvell/mwifiex/wmm.h

+0 −15
Original line number Diff line number Diff line
@@ -38,21 +38,6 @@ mwifiex_get_tid(struct mwifiex_ra_list_tbl *ptr) 
	return skb->priority;

}



/*

 * This function gets the length of a list.

 */

static inline int

mwifiex_wmm_list_len(struct list_head *head)

{

	struct list_head *pos;

	int count = 0;



	list_for_each(pos, head)

		++count;



	return count;

}



/*

 * This function checks if a RA list is empty or not.

 */

drivers/net/wireless/mediatek/mt7601u/debugfs.c

+0 −2
Original line number Diff line number Diff line
@@ -127,8 +127,6 @@ void mt7601u_init_debugfs(struct mt7601u_dev *dev) 
	struct dentry *dir;



	dir = debugfs_create_dir("mt7601u", dev->hw->wiphy->debugfsdir);

	if (!dir)

		return;



	debugfs_create_u8("temperature", 0400, dir, &dev->raw_temp);

	debugfs_create_u32("temp_mode", 0400, dir, &dev->temp_mode);

drivers/net/wireless/microchip/wilc1000/hif.c

+4 −4
Original line number Diff line number Diff line
@@ -485,6 +485,9 @@ void *wilc_parse_join_bss_param(struct cfg80211_bss *bss, 
		int rsn_ie_len = sizeof(struct element) + rsn_ie[1];

		int offset = 8;



		param->mode_802_11i = 2;

		param->rsn_found = true;



		/* extract RSN capabilities */

		if (offset < rsn_ie_len) {

			/* skip over pairwise suites */
@@ -494,14 +497,11 @@ void *wilc_parse_join_bss_param(struct cfg80211_bss *bss, 
				/* skip over authentication suites */

				offset += (rsn_ie[offset] * 4) + 2;



				if (offset + 1 < rsn_ie_len) {

					param->mode_802_11i = 2;

					param->rsn_found = true;

				if (offset + 1 < rsn_ie_len)

					memcpy(param->rsn_cap, &rsn_ie[offset], 2);

			}

		}

	}

	}



	if (param->rsn_found) {

		int i;