mac80211: rt2x00: import upstream changes and rebase our patches
[openwrt/openwrt.git] / package / kernel / mac80211 / patches / 020-04-rt61pci-use-entry-directly.patch
1 From 80a97eae304631f57ff8560f87c0b18b95321443 Mon Sep 17 00:00:00 2001
2 From: Stanislaw Gruszka <sgruszka@redhat.com>
3 Date: Wed, 8 Feb 2017 13:51:29 +0100
4 Subject: [PATCH 04/19] rt61pci: use entry directly
5
6 Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
7 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
8 ---
9 drivers/net/wireless/ralink/rt2x00/rt61pci.c | 3 +--
10 1 file changed, 1 insertion(+), 2 deletions(-)
11
12 diff --git a/drivers/net/wireless/ralink/rt2x00/rt61pci.c b/drivers/net/wireless/ralink/rt2x00/rt61pci.c
13 index 5306a3b2622d..8adb5f3abe15 100644
14 --- a/drivers/net/wireless/ralink/rt2x00/rt61pci.c
15 +++ b/drivers/net/wireless/ralink/rt2x00/rt61pci.c
16 @@ -1903,8 +1903,7 @@ static void rt61pci_write_tx_desc(struct queue_entry *entry,
17
18 rt2x00_desc_read(txd, 5, &word);
19 rt2x00_set_field32(&word, TXD_W5_PID_TYPE, entry->queue->qid);
20 - rt2x00_set_field32(&word, TXD_W5_PID_SUBTYPE,
21 - skbdesc->entry->entry_idx);
22 + rt2x00_set_field32(&word, TXD_W5_PID_SUBTYPE, entry->entry_idx);
23 rt2x00_set_field32(&word, TXD_W5_TX_POWER,
24 TXPOWER_TO_DEV(entry->queue->rt2x00dev->tx_power));
25 rt2x00_set_field32(&word, TXD_W5_WAITING_DMA_DONE_INT, 1);
26 --
27 2.12.1
28