Merge tag 'wireless-drivers-for-davem-2019-06-28' of... (e78557ba) · Commits · 戴 / test

Merge tag 'wireless-drivers-for-davem-2019-06-28' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers Kalle Valo says: ==================== wireless-drivers fixes for 5.2 Hopefully the last set of fixes for 5.2. Nothing special this around, only small fixes and support for new cards. iwlwifi * add new cards for 22000 series and smaller fixes wl18xx * fix a clang warning about unused variables mwifiex * properly handle small vendor IEs (a regression from the recent security fix) ath * fix few SPDX tags mt76 * fix A-MSDU aggregation which got broken in v5.2-rc1 ==================== Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/wireless/ath/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0-only
		# SPDX-License-Identifier: ISC
		config ATH_COMMON
		tristate

drivers/net/wireless/ath/Makefile

+1 −1

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		# SPDX-License-Identifier: ISC
		obj-$(CONFIG_ATH5K) += ath5k/
		obj-$(CONFIG_ATH9K_HW) += ath9k/
		obj-$(CONFIG_CARL9170) += carl9170/

drivers/net/wireless/ath/ar5523/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0-only
		# SPDX-License-Identifier: ISC
		config AR5523
		tristate "Atheros AR5523 wireless driver support"
		depends on MAC80211 && USB

drivers/net/wireless/ath/ar5523/Makefile

+1 −1

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0-only
		# SPDX-License-Identifier: ISC
		obj-$(CONFIG_AR5523) := ar5523.o

drivers/net/wireless/ath/ath10k/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0-only
		# SPDX-License-Identifier: ISC
		config ATH10K
		tristate "Atheros 802.11ac wireless cards support"
		depends on MAC80211 && HAS_DMA

Admin message