Commit 2da4b24b authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'wireless-drivers-2021-02-05' of... 

Merge tag 'wireless-drivers-2021-02-05' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers

Kalle Valo says:

====================
wireless-drivers fixes for v5.11

Third, and most likely the last, set of fixes for v5.11. Two very
small fixes.

ath9k
 * fix build regression related to LEDS_CLASS

mt76
 * fix a memory leak

* tag 'wireless-drivers-2021-02-05' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers:
  mt76: dma: fix a possible memory leak in mt76_add_fragment()
  ath9k: fix build error with LEDS_CLASS=m
====================

Link: https://lore.kernel.org/r/20210205163434.14D94C433ED@smtp.codeaurora.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents f317e2ea 93a1d479

drivers/net/wireless/ath/ath9k/Kconfig

+2 −6
Original line number Diff line number Diff line
@@ -21,11 +21,9 @@ config ATH9K_BTCOEX_SUPPORT 
config ATH9K

	tristate "Atheros 802.11n wireless cards support"

	depends on MAC80211 && HAS_DMA

	select MAC80211_LEDS if LEDS_CLASS=y || LEDS_CLASS=MAC80211

	select ATH9K_HW

	select ATH9K_COMMON

	imply NEW_LEDS

	imply LEDS_CLASS

	imply MAC80211_LEDS

	help

	  This module adds support for wireless adapters based on

	  Atheros IEEE 802.11n AR5008, AR9001 and AR9002 family
@@ -176,11 +174,9 @@ config ATH9K_PCI_NO_EEPROM 
config ATH9K_HTC

	tristate "Atheros HTC based wireless cards support"

	depends on USB && MAC80211

	select MAC80211_LEDS if LEDS_CLASS=y || LEDS_CLASS=MAC80211

	select ATH9K_HW

	select ATH9K_COMMON

	imply NEW_LEDS

	imply LEDS_CLASS

	imply MAC80211_LEDS

	help

	  Support for Atheros HTC based cards.

	  Chipsets supported: AR9271

drivers/net/wireless/mediatek/mt76/dma.c

+5 −3
Original line number Diff line number Diff line
@@ -509,15 +509,17 @@ static void 
mt76_add_fragment(struct mt76_dev *dev, struct mt76_queue *q, void *data,

		  int len, bool more)

{

	struct page *page = virt_to_head_page(data);

	int offset = data - page_address(page);

	struct sk_buff *skb = q->rx_head;

	struct skb_shared_info *shinfo = skb_shinfo(skb);



	if (shinfo->nr_frags < ARRAY_SIZE(shinfo->frags)) {

		offset += q->buf_offset;

		struct page *page = virt_to_head_page(data);

		int offset = data - page_address(page) + q->buf_offset;



		skb_add_rx_frag(skb, shinfo->nr_frags, page, offset, len,

				q->buf_size);

	} else {

		skb_free_frag(data);

	}



	if (more)

net/mac80211/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ config MAC80211_MESH 
config MAC80211_LEDS

	bool "Enable LED triggers"

	depends on MAC80211

	depends on LEDS_CLASS

	depends on LEDS_CLASS=y || LEDS_CLASS=MAC80211

	select LEDS_TRIGGERS

	help

	  This option enables a few LED triggers for different