Commit 2b30da45 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'wireless-drivers-next-2021-10-25' of... 

Merge tag 'wireless-drivers-next-2021-10-25' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next



Kalle Valo says:

====================
wireless-drivers-next patches for v5.16

Third set of patches for v5.16. This time we have a small one to
quickly fix two mt76 build failures I had missed in my previous pull
request.

Major changes:

mt76

* fix linking when CONFIG_MMC is disabled

* fix dev_err() format warning

* mt7615: mt7622: fix ibss and meshpoint
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6df5713e 753453af

drivers/net/wireless/mediatek/mt76/mt7615/main.c

+2 −2
Original line number Diff line number Diff line
@@ -135,8 +135,6 @@ static int get_omac_idx(enum nl80211_iftype type, u64 mask) 
	int i;



	switch (type) {

	case NL80211_IFTYPE_MESH_POINT:

	case NL80211_IFTYPE_ADHOC:

	case NL80211_IFTYPE_STATION:

		/* prefer hw bssid slot 1-3 */

		i = get_free_idx(mask, HW_BSSID_1, HW_BSSID_3);
@@ -160,6 +158,8 @@ static int get_omac_idx(enum nl80211_iftype type, u64 mask) 
			return HW_BSSID_0;



		break;

	case NL80211_IFTYPE_ADHOC:

	case NL80211_IFTYPE_MESH_POINT:

	case NL80211_IFTYPE_MONITOR:

	case NL80211_IFTYPE_AP:

		/* ap uses hw bssid 0 and ext bssid */

drivers/net/wireless/mediatek/mt76/mt7921/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ config MT7921S 
	select MT76_SDIO

	select MT7921_COMMON

	depends on MAC80211

	depends on MMC

	help

	  This adds support for MT7921S 802.11ax 2x2:2SS wireless devices.

drivers/net/wireless/mediatek/mt76/mt7921/main.c

+1 −1
Original line number Diff line number Diff line
@@ -1021,7 +1021,7 @@ void mt7921_get_et_stats(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 


	ei += wi.worker_stat_count;

	if (ei != ARRAY_SIZE(mt7921_gstrings_stats))

		dev_err(dev->mt76.dev, "ei: %d  SSTATS_LEN: %lu",

		dev_err(dev->mt76.dev, "ei: %d  SSTATS_LEN: %zu",

			ei, ARRAY_SIZE(mt7921_gstrings_stats));

}