Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a489b99 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'mt76-for-kvalo-2019-05-01' of https://github.com/nbd168/wireless 

mt76 patches for 5.2

* share more code across drivers
* new driver for MT7615 chipsets
* rework DMA API
* tx/rx performance optimizations
* use NAPI for tx cleanup on mt76x02
* AP mode support for USB devices
* USB stability fixes
* tx power handling fixes for 76x2
* endian fixes
parents 47dd82e3 4d2a6f7b

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -9781,6 +9781,8 @@ F: Documentation/devicetree/bindings/media/mediatek-vpu.txt 
MEDIATEK MT76 WIRELESS LAN DRIVER

M:	Felix Fietkau <nbd@nbd.name>

M:	Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>

R:	Ryder Lee <ryder.lee@mediatek.com>

R:	Roy Luo <royluo@google.com>

L:	linux-wireless@vger.kernel.org

S:	Maintained

F:	drivers/net/wireless/mediatek/mt76/

drivers/net/wireless/mediatek/mt76/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -22,3 +22,4 @@ config MT76x02_USB 
source "drivers/net/wireless/mediatek/mt76/mt76x0/Kconfig"

source "drivers/net/wireless/mediatek/mt76/mt76x2/Kconfig"

source "drivers/net/wireless/mediatek/mt76/mt7603/Kconfig"

source "drivers/net/wireless/mediatek/mt76/mt7615/Kconfig"

drivers/net/wireless/mediatek/mt76/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -16,10 +16,11 @@ CFLAGS_mt76x02_trace.o := -I$(src) 
mt76x02-lib-y := mt76x02_util.o mt76x02_mac.o mt76x02_mcu.o \

		 mt76x02_eeprom.o mt76x02_phy.o mt76x02_mmio.o \

		 mt76x02_txrx.o mt76x02_trace.o mt76x02_debugfs.o \

		 mt76x02_dfs.o

		 mt76x02_dfs.o mt76x02_beacon.o



mt76x02-usb-y := mt76x02_usb_mcu.o mt76x02_usb_core.o



obj-$(CONFIG_MT76x0_COMMON) += mt76x0/

obj-$(CONFIG_MT76x2_COMMON) += mt76x2/

obj-$(CONFIG_MT7603E) += mt7603/

obj-$(CONFIG_MT7615E) += mt7615/

drivers/net/wireless/mediatek/mt76/agg-rx.c

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ mt76_rx_aggr_check_ctl(struct sk_buff *skb, struct sk_buff_head *frames) 
		return;



	status->tid = le16_to_cpu(bar->control) >> 12;

	seqno = le16_to_cpu(bar->start_seq_num) >> 4;

	seqno = IEEE80211_SEQ_TO_SN(le16_to_cpu(bar->start_seq_num));

	tid = rcu_dereference(wcid->aggr[status->tid]);

	if (!tid)

		return;

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

+4 −3
Original line number Diff line number Diff line
@@ -43,14 +43,15 @@ mt76_queues_read(struct seq_file *s, void *data) 
	int i;



	for (i = 0; i < ARRAY_SIZE(dev->q_tx); i++) {

		struct mt76_queue *q = &dev->q_tx[i];

		struct mt76_sw_queue *q = &dev->q_tx[i];



		if (!q->ndesc)

		if (!q->q)

			continue;



		seq_printf(s,

			   "%d:	queued=%d head=%d tail=%d swq_queued=%d\n",

			   i, q->queued, q->head, q->tail, q->swq_queued);

			   i, q->q->queued, q->q->head, q->q->tail,

			   q->swq_queued);

	}



	return 0;