399d5cf532
Some of our local patches have been accepted upstream. And there are some more relevant changes (mostly for rt2800usb). Import them and rebase our remaining local patches on top. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
29 lines
1.1 KiB
Diff
29 lines
1.1 KiB
Diff
From 80a97eae304631f57ff8560f87c0b18b95321443 Mon Sep 17 00:00:00 2001
|
|
From: Stanislaw Gruszka <sgruszka@redhat.com>
|
|
Date: Wed, 8 Feb 2017 13:51:29 +0100
|
|
Subject: [PATCH 04/19] rt61pci: use entry directly
|
|
|
|
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
|
|
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
|
|
---
|
|
drivers/net/wireless/ralink/rt2x00/rt61pci.c | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/net/wireless/ralink/rt2x00/rt61pci.c b/drivers/net/wireless/ralink/rt2x00/rt61pci.c
|
|
index 5306a3b2622d..8adb5f3abe15 100644
|
|
--- a/drivers/net/wireless/ralink/rt2x00/rt61pci.c
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt61pci.c
|
|
@@ -1903,8 +1903,7 @@ static void rt61pci_write_tx_desc(struct queue_entry *entry,
|
|
|
|
rt2x00_desc_read(txd, 5, &word);
|
|
rt2x00_set_field32(&word, TXD_W5_PID_TYPE, entry->queue->qid);
|
|
- rt2x00_set_field32(&word, TXD_W5_PID_SUBTYPE,
|
|
- skbdesc->entry->entry_idx);
|
|
+ rt2x00_set_field32(&word, TXD_W5_PID_SUBTYPE, entry->entry_idx);
|
|
rt2x00_set_field32(&word, TXD_W5_TX_POWER,
|
|
TXPOWER_TO_DEV(entry->queue->rt2x00dev->tx_power));
|
|
rt2x00_set_field32(&word, TXD_W5_WAITING_DMA_DONE_INT, 1);
|
|
--
|
|
2.12.1
|
|
|