Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: David S. Miller <davem@davemloft.net>

+4 -3
+2 -2
drivers/net/wireless/mediatek/mt76/mt7615/main.c
··· 135 135 int i; 136 136 137 137 switch (type) { 138 - case NL80211_IFTYPE_MESH_POINT: 139 - case NL80211_IFTYPE_ADHOC: 140 138 case NL80211_IFTYPE_STATION: 141 139 /* prefer hw bssid slot 1-3 */ 142 140 i = get_free_idx(mask, HW_BSSID_1, HW_BSSID_3); ··· 158 160 return HW_BSSID_0; 159 161 160 162 break; 163 + case NL80211_IFTYPE_ADHOC: 164 + case NL80211_IFTYPE_MESH_POINT: 161 165 case NL80211_IFTYPE_MONITOR: 162 166 case NL80211_IFTYPE_AP: 163 167 /* ap uses hw bssid 0 and ext bssid */
+1
drivers/net/wireless/mediatek/mt76/mt7921/Kconfig
··· 19 19 select MT76_SDIO 20 20 select MT7921_COMMON 21 21 depends on MAC80211 22 + depends on MMC 22 23 help 23 24 This adds support for MT7921S 802.11ax 2x2:2SS wireless devices. 24 25
+1 -1
drivers/net/wireless/mediatek/mt76/mt7921/main.c
··· 1021 1021 1022 1022 ei += wi.worker_stat_count; 1023 1023 if (ei != ARRAY_SIZE(mt7921_gstrings_stats)) 1024 - dev_err(dev->mt76.dev, "ei: %d SSTATS_LEN: %lu", 1024 + dev_err(dev->mt76.dev, "ei: %d SSTATS_LEN: %zu", 1025 1025 ei, ARRAY_SIZE(mt7921_gstrings_stats)); 1026 1026 } 1027 1027