diff options
| author | Felix Fietkau <nbd@nbd.name> | 2017-06-10 15:30:31 +0200 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2017-06-17 11:51:41 +0200 |
| commit | 45572fe831f94654af35316a365c51eb8a9cdeb8 (patch) | |
| tree | a272e99019d5fd64d063ef48594b5f53bee204e1 | |
| parent | 189239ade353636f9e2788cd0467bcca97bb9324 (diff) | |
| download | upstream-45572fe831f94654af35316a365c51eb8a9cdeb8.tar.gz upstream-45572fe831f94654af35316a365c51eb8a9cdeb8.tar.bz2 upstream-45572fe831f94654af35316a365c51eb8a9cdeb8.zip | |
mac80211: refresh patches
Signed-off-by: Felix Fietkau <nbd@nbd.name>
44 files changed, 144 insertions, 323 deletions
diff --git a/package/kernel/mac80211/patches/020-01-rt2x00-avoid-introducing-a-USB-dependency-in-the-rt2.patch b/package/kernel/mac80211/patches/020-01-rt2x00-avoid-introducing-a-USB-dependency-in-the-rt2.patch index 7e829faef6..cf551fde02 100644 --- a/package/kernel/mac80211/patches/020-01-rt2x00-avoid-introducing-a-USB-dependency-in-the-rt2.patch +++ b/package/kernel/mac80211/patches/020-01-rt2x00-avoid-introducing-a-USB-dependency-in-the-rt2.patch @@ -23,11 +23,9 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> drivers/net/wireless/ralink/rt2x00/rt2x00usb.c | 5 +++++ 2 files changed, 13 insertions(+), 15 deletions(-) -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c -index 8fcbc8dc94c1..4b08007f93f7 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c -@@ -1436,21 +1436,6 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev) +@@ -1436,21 +1436,6 @@ void rt2x00lib_remove_dev(struct rt2x00_ cancel_work_sync(&rt2x00dev->intf_work); cancel_delayed_work_sync(&rt2x00dev->autowakeup_work); cancel_work_sync(&rt2x00dev->sleep_work); @@ -49,7 +47,7 @@ index 8fcbc8dc94c1..4b08007f93f7 100644 /* * Kill the tx status tasklet. -@@ -1466,6 +1451,14 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev) +@@ -1466,6 +1451,14 @@ void rt2x00lib_remove_dev(struct rt2x00_ */ rt2x00lib_uninitialize(rt2x00dev); @@ -64,11 +62,9 @@ index 8fcbc8dc94c1..4b08007f93f7 100644 /* * Free extra components */ -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c b/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c -index 838ca58d2dd6..5a2bf9f63cd7 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c -@@ -744,6 +744,11 @@ void rt2x00usb_uninitialize(struct rt2x00_dev *rt2x00dev) +@@ -744,6 +744,11 @@ void rt2x00usb_uninitialize(struct rt2x0 { struct data_queue *queue; @@ -80,6 +76,3 @@ index 838ca58d2dd6..5a2bf9f63cd7 100644 queue_for_each(rt2x00dev, queue) rt2x00usb_free_entries(queue); } --- -2.12.1 - diff --git a/package/kernel/mac80211/patches/020-02-rt2x00usb-do-not-anchor-rx-and-tx-urb-s.patch b/package/kernel/mac80211/patches/020-02-rt2x00usb-do-not-anchor-rx-and-tx-urb-s.patch index 6510b55c79..d096b64a8a 100644 --- a/package/kernel/mac80211/patches/020-02-rt2x00usb-do-not-anchor-rx-and-tx-urb-s.patch +++ b/package/kernel/mac80211/patches/020-02-rt2x00usb-do-not-anchor-rx-and-tx-urb-s.patch @@ -30,11 +30,9 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> drivers/net/wireless/ralink/rt2x00/rt2x00usb.c | 4 ---- 1 file changed, 4 deletions(-) -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c b/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c -index 5a2bf9f63cd7..fe13dd07cc2a 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c -@@ -319,10 +319,8 @@ static bool rt2x00usb_kick_tx_entry(struct queue_entry *entry, void *data) +@@ -319,10 +319,8 @@ static bool rt2x00usb_kick_tx_entry(stru entry->skb->data, length, rt2x00usb_interrupt_txdone, entry); @@ -45,7 +43,7 @@ index 5a2bf9f63cd7..fe13dd07cc2a 100644 if (status == -ENODEV) clear_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags); set_bit(ENTRY_DATA_IO_FAILED, &entry->flags); -@@ -410,10 +408,8 @@ static bool rt2x00usb_kick_rx_entry(struct queue_entry *entry, void *data) +@@ -410,10 +408,8 @@ static bool rt2x00usb_kick_rx_entry(stru entry->skb->data, entry->skb->len, rt2x00usb_interrupt_rxdone, entry); @@ -56,6 +54,3 @@ index 5a2bf9f63cd7..fe13dd07cc2a 100644 if (status == -ENODEV) clear_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags); set_bit(ENTRY_DATA_IO_FAILED, &entry->flags); --- -2.12.1 - diff --git a/package/kernel/mac80211/patches/020-03-rt2x00usb-fix-anchor-initialization.patch b/package/kernel/mac80211/patches/020-03-rt2x00usb-fix-anchor-initialization.patch index 78d8ac63d8..5ff73df2a6 100644 --- a/package/kernel/mac80211/patches/020-03-rt2x00usb-fix-anchor-initialization.patch +++ b/package/kernel/mac80211/patches/020-03-rt2x00usb-fix-anchor-initialization.patch @@ -36,11 +36,9 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> drivers/net/wireless/ralink/rt2x00/rt2x00usb.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c b/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c -index fe13dd07cc2a..c696f0ad6a68 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c -@@ -825,10 +825,6 @@ int rt2x00usb_probe(struct usb_interface *usb_intf, +@@ -825,10 +825,6 @@ int rt2x00usb_probe(struct usb_interface if (retval) goto exit_free_device; @@ -51,7 +49,7 @@ index fe13dd07cc2a..c696f0ad6a68 100644 rt2x00dev->anchor = devm_kmalloc(&usb_dev->dev, sizeof(struct usb_anchor), GFP_KERNEL); -@@ -836,10 +832,17 @@ int rt2x00usb_probe(struct usb_interface *usb_intf, +@@ -836,10 +832,17 @@ int rt2x00usb_probe(struct usb_interface retval = -ENOMEM; goto exit_free_reg; } @@ -70,6 +68,3 @@ index fe13dd07cc2a..c696f0ad6a68 100644 exit_free_reg: rt2x00usb_free_reg(rt2x00dev); --- -2.12.1 - diff --git a/package/kernel/mac80211/patches/020-04-rt61pci-use-entry-directly.patch b/package/kernel/mac80211/patches/020-04-rt61pci-use-entry-directly.patch index d8f262af85..274d8f7c3f 100644 --- a/package/kernel/mac80211/patches/020-04-rt61pci-use-entry-directly.patch +++ b/package/kernel/mac80211/patches/020-04-rt61pci-use-entry-directly.patch @@ -9,11 +9,9 @@ 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, +@@ -1903,8 +1903,7 @@ static void rt61pci_write_tx_desc(struct rt2x00_desc_read(txd, 5, &word); rt2x00_set_field32(&word, TXD_W5_PID_TYPE, entry->queue->qid); @@ -23,6 +21,3 @@ index 5306a3b2622d..8adb5f3abe15 100644 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 - diff --git a/package/kernel/mac80211/patches/020-05-rt2x00-call-entry-directly-in-rt2x00_dump_frame.patch b/package/kernel/mac80211/patches/020-05-rt2x00-call-entry-directly-in-rt2x00_dump_frame.patch index 04a5118103..241c1127bc 100644 --- a/package/kernel/mac80211/patches/020-05-rt2x00-call-entry-directly-in-rt2x00_dump_frame.patch +++ b/package/kernel/mac80211/patches/020-05-rt2x00-call-entry-directly-in-rt2x00_dump_frame.patch @@ -18,11 +18,9 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> drivers/net/wireless/ralink/rt2x00/rt73usb.c | 2 +- 10 files changed, 15 insertions(+), 14 deletions(-) -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2400pci.c b/drivers/net/wireless/ralink/rt2x00/rt2400pci.c -index 085c5b423bdf..19874439ac40 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2400pci.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2400pci.c -@@ -1200,7 +1200,7 @@ static void rt2400pci_write_beacon(struct queue_entry *entry, +@@ -1200,7 +1200,7 @@ static void rt2400pci_write_beacon(struc /* * Dump beacon to userspace through debugfs. */ @@ -31,11 +29,9 @@ index 085c5b423bdf..19874439ac40 100644 out: /* * Enable beaconing again. -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2500pci.c b/drivers/net/wireless/ralink/rt2x00/rt2500pci.c -index 9832fd50c793..791434de8052 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2500pci.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2500pci.c -@@ -1349,7 +1349,7 @@ static void rt2500pci_write_beacon(struct queue_entry *entry, +@@ -1349,7 +1349,7 @@ static void rt2500pci_write_beacon(struc /* * Dump beacon to userspace through debugfs. */ @@ -44,11 +40,9 @@ index 9832fd50c793..791434de8052 100644 out: /* * Enable beaconing again. -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2500usb.c b/drivers/net/wireless/ralink/rt2x00/rt2500usb.c -index cd3ab5a9e98d..62357465fe29 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2500usb.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2500usb.c -@@ -1170,7 +1170,7 @@ static void rt2500usb_write_beacon(struct queue_entry *entry, +@@ -1170,7 +1170,7 @@ static void rt2500usb_write_beacon(struc /* * Dump beacon to userspace through debugfs. */ @@ -57,11 +51,9 @@ index cd3ab5a9e98d..62357465fe29 100644 /* * USB devices cannot blindly pass the skb->len as the -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -index 572cdea4ca25..8223a1520316 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -@@ -1014,7 +1014,7 @@ void rt2800_write_beacon(struct queue_entry *entry, struct txentry_desc *txdesc) +@@ -1014,7 +1014,7 @@ void rt2800_write_beacon(struct queue_en /* * Dump beacon to userspace through debugfs. */ @@ -70,11 +62,9 @@ index 572cdea4ca25..8223a1520316 100644 /* * Write entire beacon with TXWI and padding to register. -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00.h b/drivers/net/wireless/ralink/rt2x00/rt2x00.h -index ea299c4e7ada..26869b3bef45 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h -@@ -1400,11 +1400,11 @@ void rt2x00queue_flush_queues(struct rt2x00_dev *rt2x00dev, bool drop); +@@ -1400,11 +1400,11 @@ void rt2x00queue_flush_queues(struct rt2 */ #ifdef CPTCFG_RT2X00_LIB_DEBUGFS void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev, @@ -88,11 +78,9 @@ index ea299c4e7ada..26869b3bef45 100644 { } #endif /* CPTCFG_RT2X00_LIB_DEBUGFS */ -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00debug.c b/drivers/net/wireless/ralink/rt2x00/rt2x00debug.c -index 72ae530e4a3b..964aefdc11f0 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00debug.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00debug.c -@@ -157,9 +157,10 @@ void rt2x00debug_update_crypto(struct rt2x00_dev *rt2x00dev, +@@ -157,9 +157,10 @@ void rt2x00debug_update_crypto(struct rt } void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev, @@ -104,7 +92,7 @@ index 72ae530e4a3b..964aefdc11f0 100644 struct skb_frame_desc *skbdesc = get_skb_frame_desc(skb); struct sk_buff *skbcopy; struct rt2x00dump_hdr *dump_hdr; -@@ -196,8 +197,8 @@ void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev, +@@ -196,8 +197,8 @@ void rt2x00debug_dump_frame(struct rt2x0 dump_hdr->chip_rf = cpu_to_le16(rt2x00dev->chip.rf); dump_hdr->chip_rev = cpu_to_le16(rt2x00dev->chip.rev); dump_hdr->type = cpu_to_le16(type); @@ -115,11 +103,9 @@ index 72ae530e4a3b..964aefdc11f0 100644 dump_hdr->timestamp_sec = cpu_to_le32(timestamp.tv_sec); dump_hdr->timestamp_usec = cpu_to_le32(timestamp.tv_usec); -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c -index 4b08007f93f7..dd6678109b7e 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c -@@ -363,7 +363,7 @@ void rt2x00lib_txdone(struct queue_entry *entry, +@@ -363,7 +363,7 @@ void rt2x00lib_txdone(struct queue_entry * Send frame to debugfs immediately, after this call is completed * we are going to overwrite the skb->cb array. */ @@ -128,7 +114,7 @@ index 4b08007f93f7..dd6678109b7e 100644 /* * Determine if the frame has been successfully transmitted and -@@ -772,7 +772,7 @@ void rt2x00lib_rxdone(struct queue_entry *entry, gfp_t gfp) +@@ -772,7 +772,7 @@ void rt2x00lib_rxdone(struct queue_entry */ rt2x00link_update_stats(rt2x00dev, entry->skb, &rxdesc); rt2x00debug_update_crypto(rt2x00dev, &rxdesc); @@ -137,11 +123,9 @@ index 4b08007f93f7..dd6678109b7e 100644 /* * Initialize RX status information, and send frame -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c -index b2364d378774..380daf4e1b8d 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c -@@ -544,7 +544,7 @@ static void rt2x00queue_write_tx_descriptor(struct queue_entry *entry, +@@ -544,7 +544,7 @@ static void rt2x00queue_write_tx_descrip * All processing on the frame has been completed, this means * it is now ready to be dumped to userspace through debugfs. */ @@ -150,11 +134,9 @@ index b2364d378774..380daf4e1b8d 100644 } static void rt2x00queue_kick_tx_queue(struct data_queue *queue, -diff --git a/drivers/net/wireless/ralink/rt2x00/rt61pci.c b/drivers/net/wireless/ralink/rt2x00/rt61pci.c -index 8adb5f3abe15..973d418b8113 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt61pci.c +++ b/drivers/net/wireless/ralink/rt2x00/rt61pci.c -@@ -1988,7 +1988,7 @@ static void rt61pci_write_beacon(struct queue_entry *entry, +@@ -1988,7 +1988,7 @@ static void rt61pci_write_beacon(struct /* * Dump beacon to userspace through debugfs. */ @@ -163,11 +145,9 @@ index 8adb5f3abe15..973d418b8113 100644 /* * Write entire beacon with descriptor and padding to register. -diff --git a/drivers/net/wireless/ralink/rt2x00/rt73usb.c b/drivers/net/wireless/ralink/rt2x00/rt73usb.c -index 1a29c4d205a5..bb8d307a789f 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt73usb.c +++ b/drivers/net/wireless/ralink/rt2x00/rt73usb.c -@@ -1557,7 +1557,7 @@ static void rt73usb_write_beacon(struct queue_entry *entry, +@@ -1557,7 +1557,7 @@ static void rt73usb_write_beacon(struct /* * Dump beacon to userspace through debugfs. */ @@ -176,6 +156,3 @@ index 1a29c4d205a5..bb8d307a789f 100644 /* * Write entire beacon with descriptor and padding to register. --- -2.12.1 - diff --git a/package/kernel/mac80211/patches/020-06-rt2x00-remove-queue_entry-from-skbdesc.patch b/package/kernel/mac80211/patches/020-06-rt2x00-remove-queue_entry-from-skbdesc.patch index d8194acd23..c2ef9c1bb0 100644 --- a/package/kernel/mac80211/patches/020-06-rt2x00-remove-queue_entry-from-skbdesc.patch +++ b/package/kernel/mac80211/patches/020-06-rt2x00-remove-queue_entry-from-skbdesc.patch @@ -13,11 +13,9 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> drivers/net/wireless/ralink/rt2x00/rt2x00queue.h | 2 -- 2 files changed, 5 deletions(-) -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c -index 380daf4e1b8d..e1660b92b20c 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c -@@ -83,7 +83,6 @@ struct sk_buff *rt2x00queue_alloc_rxskb(struct queue_entry *entry, gfp_t gfp) +@@ -83,7 +83,6 @@ struct sk_buff *rt2x00queue_alloc_rxskb( */ skbdesc = get_skb_frame_desc(skb); memset(skbdesc, 0, sizeof(*skbdesc)); @@ -25,7 +23,7 @@ index 380daf4e1b8d..e1660b92b20c 100644 if (rt2x00_has_cap_flag(rt2x00dev, REQUIRE_DMA)) { dma_addr_t skb_dma; -@@ -689,7 +688,6 @@ int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb, +@@ -689,7 +688,6 @@ int rt2x00queue_write_tx_frame(struct da goto out; } @@ -33,7 +31,7 @@ index 380daf4e1b8d..e1660b92b20c 100644 entry->skb = skb; /* -@@ -774,7 +772,6 @@ int rt2x00queue_update_beacon(struct rt2x00_dev *rt2x00dev, +@@ -774,7 +772,6 @@ int rt2x00queue_update_beacon(struct rt2 */ skbdesc = get_skb_frame_desc(intf->beacon->skb); memset(skbdesc, 0, sizeof(*skbdesc)); @@ -41,8 +39,6 @@ index 380daf4e1b8d..e1660b92b20c 100644 /* * Send beacon to hardware. -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h -index 2233b911a1d7..22d18818e850 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h @@ -116,8 +116,6 @@ struct skb_frame_desc { @@ -54,6 +50,3 @@ index 2233b911a1d7..22d18818e850 100644 }; /** --- -2.12.1 - diff --git a/package/kernel/mac80211/patches/020-07-rt2500usb-don-t-mark-register-accesses-as-inline.patch b/package/kernel/mac80211/patches/020-07-rt2500usb-don-t-mark-register-accesses-as-inline.patch index a82886d234..65496ca467 100644 --- a/package/kernel/mac80211/patches/020-07-rt2500usb-don-t-mark-register-accesses-as-inline.patch +++ b/package/kernel/mac80211/patches/020-07-rt2500usb-don-t-mark-register-accesses-as-inline.patch @@ -21,11 +21,9 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> drivers/net/wireless/ralink/rt2x00/rt2500usb.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2500usb.c b/drivers/net/wireless/ralink/rt2x00/rt2500usb.c -index 62357465fe29..0d2670a56c4c 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2500usb.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2500usb.c -@@ -55,7 +55,7 @@ MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption."); +@@ -55,7 +55,7 @@ MODULE_PARM_DESC(nohwcrypt, "Disable har * If the csr_mutex is already held then the _lock variants must * be used instead. */ @@ -34,7 +32,7 @@ index 62357465fe29..0d2670a56c4c 100644 const unsigned int offset, u16 *value) { -@@ -66,7 +66,7 @@ static inline void rt2500usb_register_read(struct rt2x00_dev *rt2x00dev, +@@ -66,7 +66,7 @@ static inline void rt2500usb_register_re *value = le16_to_cpu(reg); } @@ -43,7 +41,7 @@ index 62357465fe29..0d2670a56c4c 100644 const unsigned int offset, u16 *value) { -@@ -77,16 +77,7 @@ static inline void rt2500usb_register_read_lock(struct rt2x00_dev *rt2x00dev, +@@ -77,16 +77,7 @@ static inline void rt2500usb_register_re *value = le16_to_cpu(reg); } @@ -61,7 +59,7 @@ index 62357465fe29..0d2670a56c4c 100644 const unsigned int offset, u16 value) { -@@ -96,7 +87,7 @@ static inline void rt2500usb_register_write(struct rt2x00_dev *rt2x00dev, +@@ -96,7 +87,7 @@ static inline void rt2500usb_register_wr ®, sizeof(reg)); } @@ -70,7 +68,7 @@ index 62357465fe29..0d2670a56c4c 100644 const unsigned int offset, u16 value) { -@@ -106,7 +97,7 @@ static inline void rt2500usb_register_write_lock(struct rt2x00_dev *rt2x00dev, +@@ -106,7 +97,7 @@ static inline void rt2500usb_register_wr ®, sizeof(reg), REGISTER_TIMEOUT); } @@ -79,6 +77,3 @@ index 62357465fe29..0d2670a56c4c 100644 const unsigned int offset, void *value, const u16 length) { --- -2.12.1 - diff --git a/package/kernel/mac80211/patches/020-08-rt2x00-rt2800lib-move-rt2800_drv_data-declaration-in.patch b/package/kernel/mac80211/patches/020-08-rt2x00-rt2800lib-move-rt2800_drv_data-declaration-in.patch index c2fa92641a..8b61235e11 100644 --- a/package/kernel/mac80211/patches/020-08-rt2x00-rt2800lib-move-rt2800_drv_data-declaration-in.patch +++ b/package/kernel/mac80211/patches/020-08-rt2x00-rt2800lib-move-rt2800_drv_data-declaration-in.patch @@ -21,8 +21,6 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> drivers/net/wireless/ralink/rt2x00/rt2800lib.h | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 25 deletions(-) -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800.h b/drivers/net/wireless/ralink/rt2x00/rt2800.h -index 256496bfbafb..0e7051d8132f 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800.h +++ b/drivers/net/wireless/ralink/rt2x00/rt2800.h @@ -2987,29 +2987,4 @@ enum rt2800_eeprom_word { @@ -55,8 +53,6 @@ index 256496bfbafb..0e7051d8132f 100644 -}; - #endif /* RT2800_H */ -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.h b/drivers/net/wireless/ralink/rt2x00/rt2800lib.h -index 0a8b4df665fe..8e1ae138c3f1 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.h +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.h @@ -20,6 +20,29 @@ @@ -89,6 +85,3 @@ index 0a8b4df665fe..8e1ae138c3f1 100644 struct rt2800_ops { void (*register_read)(struct rt2x00_dev *rt2x00dev, const unsigned int offset, u32 *value); --- -2.12.1 - diff --git a/package/kernel/mac80211/patches/020-09-rt2800-identify-station-based-on-status-WCID.patch b/package/kernel/mac80211/patches/020-09-rt2800-identify-station-based-on-status-WCID.patch index e6c829cbf8..922c35833c 100644 --- a/package/kernel/mac80211/patches/020-09-rt2800-identify-station-based-on-status-WCID.patch +++ b/package/kernel/mac80211/patches/020-09-rt2800-identify-station-based-on-status-WCID.patch @@ -14,8 +14,6 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> drivers/net/wireless/ralink/rt2x00/rt2x00queue.h | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-) -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -index 8223a1520316..46405cce35e0 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c @@ -855,11 +855,13 @@ EXPORT_SYMBOL_GPL(rt2800_process_rxwi); @@ -32,7 +30,7 @@ index 8223a1520316..46405cce35e0 100644 /* * Obtain the status about this packet. -@@ -872,6 +874,7 @@ void rt2800_txdone_entry(struct queue_entry *entry, u32 status, __le32 *txwi) +@@ -872,6 +874,7 @@ void rt2800_txdone_entry(struct queue_en real_mcs = rt2x00_get_field32(status, TX_STA_FIFO_MCS); aggr = rt2x00_get_field32(status, TX_STA_FIFO_TX_AGGRE); @@ -40,7 +38,7 @@ index 8223a1520316..46405cce35e0 100644 /* * If a frame was meant to be sent as a single non-aggregated MPDU -@@ -1468,6 +1471,7 @@ int rt2800_sta_add(struct rt2x00_dev *rt2x00dev, struct ieee80211_vif *vif, +@@ -1468,6 +1471,7 @@ int rt2800_sta_add(struct rt2x00_dev *rt return 0; __set_bit(wcid - WCID_START, drv_data->sta_ids); @@ -48,7 +46,7 @@ index 8223a1520316..46405cce35e0 100644 /* * Clean up WCID attributes and write STA address to the device. -@@ -1498,6 +1502,7 @@ int rt2800_sta_remove(struct rt2x00_dev *rt2x00dev, struct ieee80211_sta *sta) +@@ -1498,6 +1502,7 @@ int rt2800_sta_remove(struct rt2x00_dev * get renewed when the WCID is reused. */ rt2800_config_wcid(rt2x00dev, NULL, wcid); @@ -56,8 +54,6 @@ index 8223a1520316..46405cce35e0 100644 __clear_bit(wcid - WCID_START, drv_data->sta_ids); return 0; -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.h b/drivers/net/wireless/ralink/rt2x00/rt2800lib.h -index 8e1ae138c3f1..6811d677a6e7 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.h +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.h @@ -41,6 +41,7 @@ struct rt2800_drv_data { @@ -68,8 +64,6 @@ index 8e1ae138c3f1..6811d677a6e7 100644 }; struct rt2800_ops { -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h -index 22d18818e850..9b297fce4692 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h @@ -102,7 +102,7 @@ enum skb_frame_desc_flags { @@ -89,6 +83,3 @@ index 22d18818e850..9b297fce4692 100644 }; /** --- -2.12.1 - diff --git a/package/kernel/mac80211/patches/020-10-rt2x00-separte-filling-tx-status-from-rt2x00lib_txdo.patch b/package/kernel/mac80211/patches/020-10-rt2x00-separte-filling-tx-status-from-rt2x00lib_txdo.patch index 278d2d6071..84f2732b22 100644 --- a/package/kernel/mac80211/patches/020-10-rt2x00-separte-filling-tx-status-from-rt2x00lib_txdo.patch +++ b/package/kernel/mac80211/patches/020-10-rt2x00-separte-filling-tx-status-from-rt2x00lib_txdo.patch @@ -12,11 +12,9 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 141 +++++++++++++------------ 1 file changed, 76 insertions(+), 65 deletions(-) -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c -index dd6678109b7e..b5d90fefc96b 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c -@@ -313,73 +313,14 @@ static inline int rt2x00lib_txdone_bar_status(struct queue_entry *entry) +@@ -313,73 +313,14 @@ static inline int rt2x00lib_txdone_bar_s return ret; } @@ -96,7 +94,7 @@ index dd6678109b7e..b5d90fefc96b 100644 rate_idx = skbdesc->tx_rate_idx; rate_flags = skbdesc->tx_rate_flags; -@@ -448,6 +389,76 @@ void rt2x00lib_txdone(struct queue_entry *entry, +@@ -448,6 +389,76 @@ void rt2x00lib_txdone(struct queue_entry else rt2x00dev->low_level_stats.dot11RTSFailureCount++; } @@ -173,6 +171,3 @@ index dd6678109b7e..b5d90fefc96b 100644 /* * Only send the status report to mac80211 when it's a frame --- -2.12.1 - diff --git a/package/kernel/mac80211/patches/020-11-rt2x00-separte-clearing-entry-from-rt2x00lib_txdone.patch b/package/kernel/mac80211/patches/020-11-rt2x00-separte-clearing-entry-from-rt2x00lib_txdone.patch index b28d894fc6..e1359397ba 100644 --- a/package/kernel/mac80211/patches/020-11-rt2x00-separte-clearing-entry-from-rt2x00lib_txdone.patch +++ b/package/kernel/mac80211/patches/020-11-rt2x00-separte-clearing-entry-from-rt2x00lib_txdone.patch @@ -12,11 +12,9 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 51 +++++++++++++++----------- 1 file changed, 29 insertions(+), 22 deletions(-) -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c -index b5d90fefc96b..03b368ac9cb6 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c -@@ -391,6 +391,32 @@ static void rt2x00lib_fill_tx_status(struct rt2x00_dev *rt2x00dev, +@@ -391,6 +391,32 @@ static void rt2x00lib_fill_tx_status(str } } @@ -49,7 +47,7 @@ index b5d90fefc96b..03b368ac9cb6 100644 void rt2x00lib_txdone(struct queue_entry *entry, struct txdone_entry_desc *txdesc) { -@@ -471,30 +497,11 @@ void rt2x00lib_txdone(struct queue_entry *entry, +@@ -471,30 +497,11 @@ void rt2x00lib_txdone(struct queue_entry ieee80211_tx_status(rt2x00dev->hw, entry->skb); else ieee80211_tx_status_ni(rt2x00dev->hw, entry->skb); @@ -83,6 +81,3 @@ index b5d90fefc96b..03b368ac9cb6 100644 } EXPORT_SYMBOL_GPL(rt2x00lib_txdone); --- -2.12.1 - diff --git a/package/kernel/mac80211/patches/020-12-rt2x00-add-txdone-nomatch-function.patch b/package/kernel/mac80211/patches/020-12-rt2x00-add-txdone-nomatch-function.patch index 7bec546a9e..60edb08e75 100644 --- a/package/kernel/mac80211/patches/020-12-rt2x00-add-txdone-nomatch-function.patch +++ b/package/kernel/mac80211/patches/020-12-rt2x00-add-txdone-nomatch-function.patch @@ -13,11 +13,9 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 50 ++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00.h b/drivers/net/wireless/ralink/rt2x00/rt2x00.h -index 340787894c69..91ba10fdf732 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h -@@ -1425,6 +1425,8 @@ void rt2x00lib_dmastart(struct queue_entry *entry); +@@ -1425,6 +1425,8 @@ void rt2x00lib_dmastart(struct queue_ent void rt2x00lib_dmadone(struct queue_entry *entry); void rt2x00lib_txdone(struct queue_entry *entry, struct txdone_entry_desc *txdesc); @@ -26,11 +24,9 @@ index 340787894c69..91ba10fdf732 100644 void rt2x00lib_txdone_noinfo(struct queue_entry *entry, u32 status); void rt2x00lib_rxdone(struct queue_entry *entry, gfp_t gfp); -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c -index 03b368ac9cb6..90fc259fb5bc 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c -@@ -417,6 +417,56 @@ static void rt2x00lib_clear_entry(struct rt2x00_dev *rt2x00dev, +@@ -417,6 +417,56 @@ static void rt2x00lib_clear_entry(struct spin_unlock_bh(&entry->queue->tx_lock); } @@ -87,6 +83,3 @@ index 03b368ac9cb6..90fc259fb5bc 100644 void rt2x00lib_txdone(struct queue_entry *entry, struct txdone_entry_desc *txdesc) { --- -2.12.1 - diff --git a/package/kernel/mac80211/patches/020-13-rt2x00-fixup-fill_tx_status-for-nomatch-case.patch b/package/kernel/mac80211/patches/020-13-rt2x00-fixup-fill_tx_status-for-nomatch-case.patch index bb35f2d300..a0cc37f491 100644 --- a/package/kernel/mac80211/patches/020-13-rt2x00-fixup-fill_tx_status-for-nomatch-case.patch +++ b/package/kernel/mac80211/patches/020-13-rt2x00-fixup-fill_tx_status-for-nomatch-case.patch @@ -13,11 +13,9 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> drivers/net/wireless/ralink/rt2x00/rt2x00queue.h | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c -index 90fc259fb5bc..e95d2aad3b3f 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c -@@ -357,6 +357,9 @@ static void rt2x00lib_fill_tx_status(struct rt2x00_dev *rt2x00dev, +@@ -357,6 +357,9 @@ static void rt2x00lib_fill_tx_status(str if (i < (IEEE80211_TX_MAX_RATES - 1)) tx_info->status.rates[i].idx = -1; /* terminate */ @@ -27,7 +25,7 @@ index 90fc259fb5bc..e95d2aad3b3f 100644 if (!(tx_info->flags & IEEE80211_TX_CTL_NO_ACK)) { if (success) tx_info->flags |= IEEE80211_TX_STAT_ACK; -@@ -375,7 +378,8 @@ static void rt2x00lib_fill_tx_status(struct rt2x00_dev *rt2x00dev, +@@ -375,7 +378,8 @@ static void rt2x00lib_fill_tx_status(str */ if (test_bit(TXDONE_AMPDU, &txdesc->flags) || tx_info->flags & IEEE80211_TX_CTL_AMPDU) { @@ -37,8 +35,6 @@ index 90fc259fb5bc..e95d2aad3b3f 100644 tx_info->status.ampdu_len = 1; tx_info->status.ampdu_ack_len = success ? 1 : 0; -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h -index 9b297fce4692..c78fb8c8838a 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h @@ -215,6 +215,7 @@ enum txdone_entry_desc_flags { @@ -49,6 +45,3 @@ index 9b297fce4692..c78fb8c8838a 100644 }; /** --- -2.12.1 - diff --git a/package/kernel/mac80211/patches/020-14-rt2x00-use-txdone_nomatch-on-rt2800usb.patch b/package/kernel/mac80211/patches/020-14-rt2x00-use-txdone_nomatch-on-rt2800usb.patch index f4e4b8b075..1e23ef7bcb 100644 --- a/package/kernel/mac80211/patches/020-14-rt2x00-use-txdone_nomatch-on-rt2800usb.patch +++ b/package/kernel/mac80211/patches/020-14-rt2x00-use-txdone_nomatch-on-rt2800usb.patch @@ -23,11 +23,9 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> drivers/net/wireless/ralink/rt2x00/rt2800usb.c | 18 ++++++-------- 4 files changed, 35 insertions(+), 19 deletions(-) -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -index 46405cce35e0..4a7bec708a13 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -@@ -852,7 +852,8 @@ void rt2800_process_rxwi(struct queue_entry *entry, +@@ -852,7 +852,8 @@ void rt2800_process_rxwi(struct queue_en } EXPORT_SYMBOL_GPL(rt2800_process_rxwi); @@ -37,7 +35,7 @@ index 46405cce35e0..4a7bec708a13 100644 { struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev; struct rt2800_drv_data *drv_data = rt2x00dev->drv_data; -@@ -860,8 +861,7 @@ void rt2800_txdone_entry(struct queue_entry *entry, u32 status, __le32 *txwi) +@@ -860,8 +861,7 @@ void rt2800_txdone_entry(struct queue_en struct txdone_entry_desc txdesc; u32 word; u16 mcs, real_mcs; @@ -47,7 +45,7 @@ index 46405cce35e0..4a7bec708a13 100644 /* * Obtain the status about this packet. -@@ -875,6 +875,7 @@ void rt2800_txdone_entry(struct queue_entry *entry, u32 status, __le32 *txwi) +@@ -875,6 +875,7 @@ void rt2800_txdone_entry(struct queue_en real_mcs = rt2x00_get_field32(status, TX_STA_FIFO_MCS); aggr = rt2x00_get_field32(status, TX_STA_FIFO_TX_AGGRE); wcid = rt2x00_get_field32(status, TX_STA_FIFO_WCID); @@ -55,7 +53,7 @@ index 46405cce35e0..4a7bec708a13 100644 /* * If a frame was meant to be sent as a single non-aggregated MPDU -@@ -891,8 +892,12 @@ void rt2800_txdone_entry(struct queue_entry *entry, u32 status, __le32 *txwi) +@@ -891,8 +892,12 @@ void rt2800_txdone_entry(struct queue_en * Hence, replace the requested rate with the real tx rate to not * confuse the rate control algortihm by providing clearly wrong * data. @@ -70,7 +68,7 @@ index 46405cce35e0..4a7bec708a13 100644 skbdesc->tx_rate_idx = real_mcs; mcs = real_mcs; } -@@ -900,6 +905,9 @@ void rt2800_txdone_entry(struct queue_entry *entry, u32 status, __le32 *txwi) +@@ -900,6 +905,9 @@ void rt2800_txdone_entry(struct queue_en if (aggr == 1 || ampdu == 1) __set_bit(TXDONE_AMPDU, &txdesc.flags); @@ -80,7 +78,7 @@ index 46405cce35e0..4a7bec708a13 100644 /* * Ralink has a retry mechanism using a global fallback * table. We setup this fallback table to try the immediate -@@ -931,7 +939,18 @@ void rt2800_txdone_entry(struct queue_entry *entry, u32 status, __le32 *txwi) +@@ -931,7 +939,18 @@ void rt2800_txdone_entry(struct queue_en if (txdesc.retry) __set_bit(TXDONE_FALLBACK, &txdesc.flags); @@ -100,11 +98,9 @@ index 46405cce35e0..4a7bec708a13 100644 } EXPORT_SYMBOL_GPL(rt2800_txdone_entry); -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.h b/drivers/net/wireless/ralink/rt2x00/rt2800lib.h -index 6811d677a6e7..d9ef260d542a 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.h +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.h -@@ -191,7 +191,8 @@ void rt2800_write_tx_data(struct queue_entry *entry, +@@ -191,7 +191,8 @@ void rt2800_write_tx_data(struct queue_e struct txentry_desc *txdesc); void rt2800_process_rxwi(struct queue_entry *entry, struct rxdone_entry_desc *txdesc); @@ -114,11 +110,9 @@ index 6811d677a6e7..d9ef260d542a 100644 void rt2800_write_beacon(struct queue_entry *entry, struct txentry_desc *txdesc); void rt2800_clear_beacon(struct queue_entry *entry); -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800mmio.c b/drivers/net/wireless/ralink/rt2x00/rt2800mmio.c -index de4790b41be7..3ab3b5323897 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800mmio.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800mmio.c -@@ -239,7 +239,7 @@ static bool rt2800mmio_txdone_release_entries(struct queue_entry *entry, +@@ -239,7 +239,7 @@ static bool rt2800mmio_txdone_release_en { if (test_bit(ENTRY_DATA_STATUS_SET, &entry->flags)) { rt2800_txdone_entry(entry, entry->status, @@ -127,11 +121,9 @@ index de4790b41be7..3ab3b5323897 100644 return false; } -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800usb.c b/drivers/net/wireless/ralink/rt2x00/rt2800usb.c -index 205a7b8ac8a7..f11e3f532a84 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800usb.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800usb.c -@@ -501,8 +501,7 @@ static int rt2800usb_get_tx_data_len(struct queue_entry *entry) +@@ -501,8 +501,7 @@ static int rt2800usb_get_tx_data_len(str /* * TX control handlers */ @@ -141,7 +133,7 @@ index 205a7b8ac8a7..f11e3f532a84 100644 { __le32 *txwi; u32 word; -@@ -515,7 +514,7 @@ rt2800usb_txdone_entry_check(struct queue_entry *entry, u32 reg) +@@ -515,7 +514,7 @@ rt2800usb_txdone_entry_check(struct queu * frame. */ if (test_bit(ENTRY_DATA_IO_FAILED, &entry->flags)) @@ -150,7 +142,7 @@ index 205a7b8ac8a7..f11e3f532a84 100644 wcid = rt2x00_get_field32(reg, TX_STA_FIFO_WCID); ack = rt2x00_get_field32(reg, TX_STA_FIFO_TX_ACK_REQUIRED); -@@ -537,10 +536,10 @@ rt2800usb_txdone_entry_check(struct queue_entry *entry, u32 reg) +@@ -537,10 +536,10 @@ rt2800usb_txdone_entry_check(struct queu rt2x00_dbg(entry->queue->rt2x00dev, "TX status report missed for queue %d entry %d\n", entry->queue->qid, entry->entry_idx); @@ -163,7 +155,7 @@ index 205a7b8ac8a7..f11e3f532a84 100644 } static void rt2800usb_txdone(struct rt2x00_dev *rt2x00dev) -@@ -549,7 +548,7 @@ static void rt2800usb_txdone(struct rt2x00_dev *rt2x00dev) +@@ -549,7 +548,7 @@ static void rt2800usb_txdone(struct rt2x struct queue_entry *entry; u32 reg; u8 qid; @@ -172,7 +164,7 @@ index 205a7b8ac8a7..f11e3f532a84 100644 while (kfifo_get(&rt2x00dev->txstatus_fifo, ®)) { /* -@@ -574,11 +573,8 @@ static void rt2800usb_txdone(struct rt2x00_dev *rt2x00dev) +@@ -574,11 +573,8 @@ static void rt2800usb_txdone(struct rt2x break; } @@ -186,6 +178,3 @@ index 205a7b8ac8a7..f11e3f532a84 100644 } } --- -2.12.1 - diff --git a/package/kernel/mac80211/patches/020-15-rt2800-status-based-rate-flags-for-nomatch-case.patch b/package/kernel/mac80211/patches/020-15-rt2800-status-based-rate-flags-for-nomatch-case.patch index 4e18dc8e2a..37838e8895 100644 --- a/package/kernel/mac80211/patches/020-15-rt2800-status-based-rate-flags-for-nomatch-case.patch +++ b/package/kernel/mac80211/patches/020-15-rt2800-status-based-rate-flags-for-nomatch-case.patch @@ -17,8 +17,6 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 35 +++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 1 deletion(-) -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800.h b/drivers/net/wireless/ralink/rt2x00/rt2800.h -index 0e7051d8132f..480b08601785 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800.h +++ b/drivers/net/wireless/ralink/rt2x00/rt2800.h @@ -1760,6 +1760,8 @@ @@ -30,11 +28,9 @@ index 0e7051d8132f..480b08601785 100644 #define TX_STA_FIFO_PHYMODE FIELD32(0xc0000000) /* -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -index 4a7bec708a13..8d00c599e47a 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -@@ -852,6 +852,39 @@ void rt2800_process_rxwi(struct queue_entry *entry, +@@ -852,6 +852,39 @@ void rt2800_process_rxwi(struct queue_en } EXPORT_SYMBOL_GPL(rt2800_process_rxwi); @@ -74,7 +70,7 @@ index 4a7bec708a13..8d00c599e47a 100644 void rt2800_txdone_entry(struct queue_entry *entry, u32 status, __le32 *txwi, bool match) { -@@ -898,7 +931,7 @@ void rt2800_txdone_entry(struct queue_entry *entry, u32 status, __le32 *txwi, +@@ -898,7 +931,7 @@ void rt2800_txdone_entry(struct queue_en * and provide retry count. */ if (unlikely((aggr == 1 && ampdu == 0 && real_mcs != mcs)) || !match) { @@ -83,6 +79,3 @@ index 4a7bec708a13..8d00c599e47a 100644 mcs = real_mcs; } --- -2.12.1 - diff --git a/package/kernel/mac80211/patches/020-16-rt2800-use-TXOP_BACKOFF-for-probe-frames.patch b/package/kernel/mac80211/patches/020-16-rt2800-use-TXOP_BACKOFF-for-probe-frames.patch index 31d79bb751..7825810cef 100644 --- a/package/kernel/mac80211/patches/020-16-rt2800-use-TXOP_BACKOFF-for-probe-frames.patch +++ b/package/kernel/mac80211/patches/020-16-rt2800-use-TXOP_BACKOFF-for-probe-frames.patch @@ -14,11 +14,9 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> drivers/net/wireless/ralink/rt2x00/rt2x00queue.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c -index e1660b92b20c..a2c1ca5c76d1 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c -@@ -372,15 +372,16 @@ static void rt2x00queue_create_tx_descriptor_ht(struct rt2x00_dev *rt2x00dev, +@@ -372,15 +372,16 @@ static void rt2x00queue_create_tx_descri /* * Determine IFS values @@ -38,6 +36,3 @@ index e1660b92b20c..a2c1ca5c76d1 100644 txdesc->u.ht.txop = TXOP_BACKOFF; else if (!(tx_info->flags & IEEE80211_TX_CTL_FIRST_FRAGMENT)) txdesc->u.ht.txop = TXOP_SIFS; --- -2.12.1 - diff --git a/package/kernel/mac80211/patches/020-17-rt2x00-fix-rt2x00debug_dump_frame-comment.patch b/package/kernel/mac80211/patches/020-17-rt2x00-fix-rt2x00debug_dump_frame-comment.patch index 4e53092d12..415bf5b2a6 100644 --- a/package/kernel/mac80211/patches/020-17-rt2x00-fix-rt2x00debug_dump_frame-comment.patch +++ b/package/kernel/mac80211/patches/020-17-rt2x00-fix-rt2x00debug_dump_frame-comment.patch @@ -10,11 +10,9 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> drivers/net/wireless/ralink/rt2x00/rt2x00.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00.h b/drivers/net/wireless/ralink/rt2x00/rt2x00.h -index 91ba10fdf732..ce340bfd71a0 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h -@@ -1396,7 +1396,7 @@ void rt2x00queue_flush_queues(struct rt2x00_dev *rt2x00dev, bool drop); +@@ -1396,7 +1396,7 @@ void rt2x00queue_flush_queues(struct rt2 * rt2x00debug_dump_frame - Dump a frame to userspace through debugfs. * @rt2x00dev: Pointer to &struct rt2x00_dev. * @type: The type of frame that is being dumped. @@ -23,6 +21,3 @@ index 91ba10fdf732..ce340bfd71a0 100644 */ #ifdef CPTCFG_RT2X00_LIB_DEBUGFS void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev, --- -2.12.1 - diff --git a/package/kernel/mac80211/patches/020-18-rt2x00-fix-TX_PWR_CFG_4-register-definition.patch b/package/kernel/mac80211/patches/020-18-rt2x00-fix-TX_PWR_CFG_4-register-definition.patch index 3cf342d690..c6fb7dd2c4 100644 --- a/package/kernel/mac80211/patches/020-18-rt2x00-fix-TX_PWR_CFG_4-register-definition.patch +++ b/package/kernel/mac80211/patches/020-18-rt2x00-fix-TX_PWR_CFG_4-register-definition.patch @@ -13,8 +13,6 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> drivers/net/wireless/ralink/rt2x00/rt2800.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800.h b/drivers/net/wireless/ralink/rt2x00/rt2800.h -index 480b08601785..fd1dbd956bad 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800.h +++ b/drivers/net/wireless/ralink/rt2x00/rt2800.h @@ -1171,10 +1171,10 @@ @@ -32,6 +30,3 @@ index 480b08601785..fd1dbd956bad 100644 /* * TX_PIN_CFG: --- -2.12.1 - diff --git a/package/kernel/mac80211/patches/020-19-rt2x00-add-support-for-MT7620.patch b/package/kernel/mac80211/patches/020-19-rt2x00-add-support-for-MT7620.patch index 7b99312744..b91e5821cd 100644 --- a/package/kernel/mac80211/patches/020-19-rt2x00-add-support-for-MT7620.patch +++ b/package/kernel/mac80211/patches/020-19-rt2x00-add-support-for-MT7620.patch @@ -19,8 +19,6 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> drivers/net/wireless/ralink/rt2x00/rt2x00.h | 1 + 5 files changed, 1578 insertions(+), 27 deletions(-) -diff --git a/drivers/net/wireless/ralink/rt2x00/Kconfig b/drivers/net/wireless/ralink/rt2x00/Kconfig -index de62f5dcb62f..a1d1cfe214d2 100644 --- a/drivers/net/wireless/ralink/rt2x00/Kconfig +++ b/drivers/net/wireless/ralink/rt2x00/Kconfig @@ -210,7 +210,7 @@ endif @@ -32,8 +30,6 @@ index de62f5dcb62f..a1d1cfe214d2 100644 select RT2X00_LIB_SOC select RT2X00_LIB_MMIO select RT2X00_LIB_CRYPTO -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800.h b/drivers/net/wireless/ralink/rt2x00/rt2800.h -index fd1dbd956bad..6a8c93fb6a43 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800.h +++ b/drivers/net/wireless/ralink/rt2x00/rt2800.h @@ -79,6 +79,7 @@ @@ -376,8 +372,6 @@ index fd1dbd956bad..6a8c93fb6a43 100644 EEPROM_TSSI_BOUND_A1, EEPROM_TSSI_BOUND_A2, EEPROM_TSSI_BOUND_A3, -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -index 8d00c599e47a..201b12ed90c6 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c @@ -59,6 +59,9 @@ @@ -390,7 +384,7 @@ index 8d00c599e47a..201b12ed90c6 100644 #define WAIT_FOR_RF(__dev, __reg) \ rt2800_regbusy_read((__dev), RF_CSR_CFG0, RF_CSR_CFG0_BUSY, (__reg)) #define WAIT_FOR_MCU(__dev, __reg) \ -@@ -150,19 +153,56 @@ static void rt2800_rfcsr_write(struct rt2x00_dev *rt2x00dev, +@@ -150,19 +153,56 @@ static void rt2800_rfcsr_write(struct rt * Wait until the RFCSR becomes available, afterwards we * can safely write the new data into the register. */ @@ -413,8 +407,7 @@ index 8d00c599e47a..201b12ed90c6 100644 + rt2800_register_write_lock(rt2x00dev, RF_CSR_CFG, reg); + } + break; - -- rt2800_register_write_lock(rt2x00dev, RF_CSR_CFG, reg); ++ + default: + if (WAIT_FOR_RFCSR(rt2x00dev, ®)) { + reg = 0; @@ -422,7 +415,8 @@ index 8d00c599e47a..201b12ed90c6 100644 + rt2x00_set_field32(®, RF_CSR_CFG_REGNUM, word); + rt2x00_set_field32(®, RF_CSR_CFG_WRITE, 1); + rt2x00_set_field32(®, RF_CSR_CFG_BUSY, 1); -+ + +- rt2800_register_write_lock(rt2x00dev, RF_CSR_CFG, reg); + rt2800_register_write_lock(rt2x00dev, RF_CSR_CFG, reg); + } + break; @@ -454,7 +448,7 @@ index 8d00c599e47a..201b12ed90c6 100644 static void rt2800_rfcsr_read(struct rt2x00_dev *rt2x00dev, const unsigned int word, u8 *value) { -@@ -178,22 +218,48 @@ static void rt2800_rfcsr_read(struct rt2x00_dev *rt2x00dev, +@@ -178,22 +218,48 @@ static void rt2800_rfcsr_read(struct rt2 * doesn't become available in time, reg will be 0xffffffff * which means we return 0xff to the caller. */ @@ -479,11 +473,11 @@ index 8d00c599e47a..201b12ed90c6 100644 - } + WAIT_FOR_RFCSR_MT7620(rt2x00dev, ®); + } - -- *value = rt2x00_get_field32(reg, RF_CSR_CFG_DATA); ++ + *value = rt2x00_get_field32(reg, RF_CSR_CFG_DATA_MT7620); + break; -+ + +- *value = rt2x00_get_field32(reg, RF_CSR_CFG_DATA); + default: + if (WAIT_FOR_RFCSR(rt2x00dev, ®)) { + reg = 0; @@ -512,7 +506,7 @@ index 8d00c599e47a..201b12ed90c6 100644 static void rt2800_rf_write(struct rt2x00_dev *rt2x00dev, const unsigned int word, const u32 value) { -@@ -250,6 +316,7 @@ static const unsigned int rt2800_eeprom_map[EEPROM_WORD_COUNT] = { +@@ -250,6 +316,7 @@ static const unsigned int rt2800_eeprom_ [EEPROM_TSSI_BOUND_BG5] = 0x003b, [EEPROM_TXPOWER_A1] = 0x003c, [EEPROM_TXPOWER_A2] = 0x0053, @@ -520,7 +514,7 @@ index 8d00c599e47a..201b12ed90c6 100644 [EEPROM_TSSI_BOUND_A1] = 0x006a, [EEPROM_TSSI_BOUND_A2] = 0x006b, [EEPROM_TSSI_BOUND_A3] = 0x006c, -@@ -524,6 +591,7 @@ void rt2800_get_txwi_rxwi_size(struct rt2x00_dev *rt2x00dev, +@@ -524,6 +591,7 @@ void rt2800_get_txwi_rxwi_size(struct rt break; case RT5592: @@ -528,7 +522,7 @@ index 8d00c599e47a..201b12ed90c6 100644 *txwi_size = TXWI_DESC_SIZE_5WORDS; *rxwi_size = RXWI_DESC_SIZE_6WORDS; break; -@@ -2810,7 +2878,8 @@ static void rt2800_config_channel_rf53xx(struct rt2x00_dev *rt2x00dev, +@@ -2810,7 +2878,8 @@ static void rt2800_config_channel_rf53xx rt2800_rfcsr_write(rt2x00dev, 59, r59_nonbt_rev[idx]); } else if (rt2x00_rt(rt2x00dev, RT5390) || @@ -538,7 +532,7 @@ index 8d00c599e47a..201b12ed90c6 100644 static const char r59_non_bt[] = {0x8f, 0x8f, 0x8f, 0x8f, 0x8f, 0x8f, 0x8f, 0x8d, 0x8a, 0x88, 0x88, 0x87, 0x87, 0x86}; -@@ -3104,6 +3173,242 @@ static void rt2800_config_channel_rf55xx(struct rt2x00_dev *rt2x00dev, +@@ -3104,6 +3173,242 @@ static void rt2800_config_channel_rf55xx rt2800_bbp_write(rt2x00dev, 196, (rf->channel <= 14) ? 0x19 : 0x7F); } @@ -781,7 +775,7 @@ index 8d00c599e47a..201b12ed90c6 100644 static void rt2800_bbp_write_with_rx_chain(struct rt2x00_dev *rt2x00dev, const unsigned int word, const u8 value) -@@ -3228,7 +3533,7 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev, +@@ -3228,7 +3533,7 @@ static void rt2800_config_channel(struct struct channel_info *info) { u32 reg; @@ -790,7 +784,7 @@ index 8d00c599e47a..201b12ed90c6 100644 u8 bbp, rfcsr; info->default_power1 = rt2800_txpower_to_dev(rt2x00dev, rf->channel, -@@ -3273,6 +3578,9 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev, +@@ -3273,6 +3578,9 @@ static void rt2800_config_channel(struct case RF5592: rt2800_config_channel_rf55xx(rt2x00dev, conf, rf, info); break; @@ -800,7 +794,7 @@ index 8d00c599e47a..201b12ed90c6 100644 default: rt2800_config_channel_rf2xxx(rt2x00dev, conf, rf, info); } -@@ -3347,7 +3655,8 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev, +@@ -3347,7 +3655,8 @@ static void rt2800_config_channel(struct if (rf->channel <= 14) { if (!rt2x00_rt(rt2x00dev, RT5390) && @@ -810,7 +804,7 @@ index 8d00c599e47a..201b12ed90c6 100644 if (rt2x00_has_cap_external_lna_bg(rt2x00dev)) { rt2800_bbp_write(rt2x00dev, 82, 0x62); rt2800_bbp_write(rt2x00dev, 75, 0x46); -@@ -3367,7 +3676,7 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev, +@@ -3367,7 +3676,7 @@ static void rt2800_config_channel(struct rt2800_bbp_write(rt2x00dev, 82, 0x94); else if (rt2x00_rt(rt2x00dev, RT3593)) rt2800_bbp_write(rt2x00dev, 82, 0x82); @@ -819,7 +813,7 @@ index 8d00c599e47a..201b12ed90c6 100644 rt2800_bbp_write(rt2x00dev, 82, 0xf2); if (rt2x00_rt(rt2x00dev, RT3593)) -@@ -3388,7 +3697,7 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev, +@@ -3388,7 +3697,7 @@ static void rt2800_config_channel(struct if (rt2x00_rt(rt2x00dev, RT3572)) rt2800_rfcsr_write(rt2x00dev, 8, 0); @@ -828,7 +822,7 @@ index 8d00c599e47a..201b12ed90c6 100644 switch (rt2x00dev->default_ant.tx_chain_num) { case 3: -@@ -3437,6 +3746,7 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev, +@@ -3437,6 +3746,7 @@ static void rt2800_config_channel(struct rt2x00_set_field32(&tx_pin, TX_PIN_CFG_RFTR_EN, 1); rt2x00_set_field32(&tx_pin, TX_PIN_CFG_TRSW_EN, 1); @@ -836,7 +830,7 @@ index 8d00c599e47a..201b12ed90c6 100644 rt2800_register_write(rt2x00dev, TX_PIN_CFG, tx_pin); -@@ -3495,7 +3805,7 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev, +@@ -3495,7 +3805,7 @@ static void rt2800_config_channel(struct usleep_range(1000, 1500); } @@ -845,7 +839,7 @@ index 8d00c599e47a..201b12ed90c6 100644 rt2800_bbp_write(rt2x00dev, 195, 141); rt2800_bbp_write(rt2x00dev, 196, conf_is_ht40(conf) ? 0x10 : 0x1a); -@@ -4182,6 +4492,128 @@ static void rt2800_config_txpower_rt3593(struct rt2x00_dev *rt2x00dev, +@@ -4182,6 +4492,128 @@ static void rt2800_config_txpower_rt3593 (unsigned long) regs[i]); } @@ -974,7 +968,7 @@ index 8d00c599e47a..201b12ed90c6 100644 /* * We configure transmit power using MAC TX_PWR_CFG_{0,...,N} registers and * BBP R1 register. TX_PWR_CFG_X allow to configure per rate TX power values, -@@ -4378,6 +4810,8 @@ static void rt2800_config_txpower(struct rt2x00_dev *rt2x00dev, +@@ -4378,6 +4810,8 @@ static void rt2800_config_txpower(struct { if (rt2x00_rt(rt2x00dev, RT3593)) rt2800_config_txpower_rt3593(rt2x00dev, chan, power_level); @@ -983,7 +977,7 @@ index 8d00c599e47a..201b12ed90c6 100644 else rt2800_config_txpower_rt28xx(rt2x00dev, chan, power_level); } -@@ -4393,6 +4827,7 @@ void rt2800_vco_calibration(struct rt2x00_dev *rt2x00dev) +@@ -4393,6 +4827,7 @@ void rt2800_vco_calibration(struct rt2x0 { u32 tx_pin; u8 rfcsr; @@ -991,7 +985,7 @@ index 8d00c599e47a..201b12ed90c6 100644 /* * A voltage-controlled oscillator(VCO) is an electronic oscillator -@@ -4431,6 +4866,15 @@ void rt2800_vco_calibration(struct rt2x00_dev *rt2x00dev) +@@ -4431,6 +4866,15 @@ void rt2800_vco_calibration(struct rt2x0 rt2800_rfcsr_read(rt2x00dev, 3, &rfcsr); rt2x00_set_field8(&rfcsr, RFCSR3_VCOCAL_EN, 1); rt2800_rfcsr_write(rt2x00dev, 3, rfcsr); @@ -1007,7 +1001,7 @@ index 8d00c599e47a..201b12ed90c6 100644 break; default: WARN_ONCE(1, "Not supported RF chipet %x for VCO recalibration", -@@ -4438,7 +4882,8 @@ void rt2800_vco_calibration(struct rt2x00_dev *rt2x00dev) +@@ -4438,7 +4882,8 @@ void rt2800_vco_calibration(struct rt2x0 return; } @@ -1017,7 +1011,7 @@ index 8d00c599e47a..201b12ed90c6 100644 rt2800_register_read(rt2x00dev, TX_PIN_CFG, &tx_pin); if (rt2x00dev->rf_channel <= 14) { -@@ -4470,6 +4915,42 @@ void rt2800_vco_calibration(struct rt2x00_dev *rt2x00dev) +@@ -4470,6 +4915,42 @@ void rt2800_vco_calibration(struct rt2x0 } rt2800_register_write(rt2x00dev, TX_PIN_CFG, tx_pin); @@ -1060,7 +1054,7 @@ index 8d00c599e47a..201b12ed90c6 100644 } EXPORT_SYMBOL_GPL(rt2800_vco_calibration); -@@ -4568,7 +5049,8 @@ static u8 rt2800_get_default_vgc(struct rt2x00_dev *rt2x00dev) +@@ -4568,7 +5049,8 @@ static u8 rt2800_get_default_vgc(struct rt2x00_rt(rt2x00dev, RT3593) || rt2x00_rt(rt2x00dev, RT5390) || rt2x00_rt(rt2x00dev, RT5392) || @@ -1070,7 +1064,7 @@ index 8d00c599e47a..201b12ed90c6 100644 vgc = 0x1c + (2 * rt2x00dev->lna_gain); else vgc = 0x2e + rt2x00dev->lna_gain; -@@ -4795,7 +5277,8 @@ static int rt2800_init_registers(struct rt2x00_dev *rt2x00dev) +@@ -4795,7 +5277,8 @@ static int rt2800_init_registers(struct 0x00000000); } } else if (rt2x00_rt(rt2x00dev, RT5390) || @@ -1080,7 +1074,7 @@ index 8d00c599e47a..201b12ed90c6 100644 rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000404); rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00080606); rt2800_register_write(rt2x00dev, TX_SW_CFG2, 0x00000000); -@@ -4805,6 +5288,24 @@ static int rt2800_init_registers(struct rt2x00_dev *rt2x00dev) +@@ -4805,6 +5288,24 @@ static int rt2800_init_registers(struct rt2800_register_write(rt2x00dev, TX_SW_CFG2, 0x00000000); } else if (rt2x00_rt(rt2x00dev, RT5350)) { rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000404); @@ -1105,7 +1099,7 @@ index 8d00c599e47a..201b12ed90c6 100644 } else { rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000000); rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00080606); -@@ -5786,6 +6287,231 @@ static void rt2800_init_bbp_5592(struct rt2x00_dev *rt2x00dev) +@@ -5786,6 +6287,231 @@ static void rt2800_init_bbp_5592(struct rt2800_bbp_write(rt2x00dev, 103, 0xc0); } @@ -1337,7 +1331,7 @@ index 8d00c599e47a..201b12ed90c6 100644 static void rt2800_init_bbp(struct rt2x00_dev *rt2x00dev) { unsigned int i; -@@ -5830,6 +6556,9 @@ static void rt2800_init_bbp(struct rt2x00_dev *rt2x00dev) +@@ -5830,6 +6556,9 @@ static void rt2800_init_bbp(struct rt2x0 case RT5592: rt2800_init_bbp_5592(rt2x00dev); return; @@ -1347,7 +1341,7 @@ index 8d00c599e47a..201b12ed90c6 100644 } for (i = 0; i < EEPROM_BBP_SIZE; i++) { -@@ -6901,6 +7630,615 @@ static void rt2800_init_rfcsr_5592(struct rt2x00_dev *rt2x00dev) +@@ -6901,6 +7630,615 @@ static void rt2800_init_rfcsr_5592(struc rt2800_led_open_drain_enable(rt2x00dev); } @@ -1963,7 +1957,7 @@ index 8d00c599e47a..201b12ed90c6 100644 static void rt2800_init_rfcsr(struct rt2x00_dev *rt2x00dev) { if (rt2800_is_305x_soc(rt2x00dev)) { -@@ -6941,6 +8279,9 @@ static void rt2800_init_rfcsr(struct rt2x00_dev *rt2x00dev) +@@ -6941,6 +8279,9 @@ static void rt2800_init_rfcsr(struct rt2 case RT5592: rt2800_init_rfcsr_5592(rt2x00dev); break; @@ -1973,7 +1967,7 @@ index 8d00c599e47a..201b12ed90c6 100644 } } -@@ -7307,7 +8648,8 @@ static int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev) +@@ -7307,7 +8648,8 @@ static int rt2800_init_eeprom(struct rt2 */ if (rt2x00_rt(rt2x00dev, RT3290) || rt2x00_rt(rt2x00dev, RT5390) || @@ -1983,7 +1977,7 @@ index 8d00c599e47a..201b12ed90c6 100644 rt2800_eeprom_read(rt2x00dev, EEPROM_CHIP_ID, &rf); else if (rt2x00_rt(rt2x00dev, RT3352)) rf = RF3322; -@@ -7339,6 +8681,7 @@ static int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev) +@@ -7339,6 +8681,7 @@ static int rt2800_init_eeprom(struct rt2 case RF5390: case RF5392: case RF5592: @@ -1991,7 +1985,7 @@ index 8d00c599e47a..201b12ed90c6 100644 break; default: rt2x00_err(rt2x00dev, "Invalid RF chipset 0x%04x detected\n", -@@ -7746,6 +9089,23 @@ static const struct rf_channel rf_vals_5592_xtal40[] = { +@@ -7746,6 +9089,23 @@ static const struct rf_channel rf_vals_5 {196, 83, 0, 12, 1}, }; @@ -2015,7 +2009,7 @@ index 8d00c599e47a..201b12ed90c6 100644 static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev) { struct hw_mode_spec *spec = &rt2x00dev->spec; -@@ -7849,6 +9209,11 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev) +@@ -7849,6 +9209,11 @@ static int rt2800_probe_hw_mode(struct r spec->channels = rf_vals_3x; break; @@ -2027,7 +2021,7 @@ index 8d00c599e47a..201b12ed90c6 100644 case RF3052: case RF3053: spec->num_channels = ARRAY_SIZE(rf_vals_3x); -@@ -7980,6 +9345,7 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev) +@@ -7980,6 +9345,7 @@ static int rt2800_probe_hw_mode(struct r case RF5390: case RF5392: case RF5592: @@ -2035,7 +2029,7 @@ index 8d00c599e47a..201b12ed90c6 100644 __set_bit(CAPABILITY_VCO_RECALIBRATION, &rt2x00dev->cap_flags); break; } -@@ -8024,6 +9390,9 @@ static int rt2800_probe_rt(struct rt2x00_dev *rt2x00dev) +@@ -8024,6 +9390,9 @@ static int rt2800_probe_rt(struct rt2x00 return -ENODEV; } @@ -2045,8 +2039,6 @@ index 8d00c599e47a..201b12ed90c6 100644 rt2x00_set_rt(rt2x00dev, rt, rev); return 0; -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.h b/drivers/net/wireless/ralink/rt2x00/rt2800lib.h -index d9ef260d542a..f357531d9488 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.h +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.h @@ -33,6 +33,10 @@ @@ -2060,8 +2052,6 @@ index d9ef260d542a..f357531d9488 100644 u8 bbp25; u8 bbp26; u8 txmixer_gain_24g; -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00.h b/drivers/net/wireless/ralink/rt2x00/rt2x00.h -index ce340bfd71a0..8fdd2f9726ee 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h @@ -174,6 +174,7 @@ struct rt2x00_chip { @@ -2072,6 +2062,3 @@ index ce340bfd71a0..8fdd2f9726ee 100644 u16 rf; u16 rev; --- -2.12.1 - diff --git a/package/kernel/mac80211/patches/020-20-rt2x00-reverse-external-PA-capability-flag-logic.patch b/package/kernel/mac80211/patches/020-20-rt2x00-reverse-external-PA-capability-flag-logic.patch index 35b1918fb8..7994456de7 100644 --- a/package/kernel/mac80211/patches/020-20-rt2x00-reverse-external-PA-capability-flag-logic.patch +++ b/package/kernel/mac80211/patches/020-20-rt2x00-reverse-external-PA-capability-flag-logic.patch @@ -16,11 +16,9 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> drivers/net/wireless/ralink/rt2x00/rt2x00.h | 4 +-- 2 files changed, 22 insertions(+), 22 deletions(-) -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -index 201b12ed90c6..ba06ac2d876d 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -@@ -7014,9 +7014,9 @@ static void rt2800_init_rfcsr_3290(struct rt2x00_dev *rt2x00dev) +@@ -7014,9 +7014,9 @@ static void rt2800_init_rfcsr_3290(struc static void rt2800_init_rfcsr_3352(struct rt2x00_dev *rt2x00dev) { @@ -32,7 +30,7 @@ index 201b12ed90c6..ba06ac2d876d 100644 &rt2x00dev->cap_flags); u8 rfcsr; -@@ -7056,9 +7056,9 @@ static void rt2800_init_rfcsr_3352(struct rt2x00_dev *rt2x00dev) +@@ -7056,9 +7056,9 @@ static void rt2800_init_rfcsr_3352(struc rt2800_rfcsr_write(rt2x00dev, 32, 0x80); rt2800_rfcsr_write(rt2x00dev, 33, 0x00); rfcsr = 0x01; @@ -44,7 +42,7 @@ index 201b12ed90c6..ba06ac2d876d 100644 rt2x00_set_field8(&rfcsr, RFCSR34_TX1_EXT_PA, 1); rt2800_rfcsr_write(rt2x00dev, 34, rfcsr); rt2800_rfcsr_write(rt2x00dev, 35, 0x03); -@@ -7068,13 +7068,13 @@ static void rt2800_init_rfcsr_3352(struct rt2x00_dev *rt2x00dev) +@@ -7068,13 +7068,13 @@ static void rt2800_init_rfcsr_3352(struc rt2800_rfcsr_write(rt2x00dev, 39, 0xc5); rt2800_rfcsr_write(rt2x00dev, 40, 0x33); rfcsr = 0x52; @@ -60,7 +58,7 @@ index 201b12ed90c6..ba06ac2d876d 100644 rt2x00_set_field8(&rfcsr, RFCSR42_BIT1, 1); rt2x00_set_field8(&rfcsr, RFCSR42_BIT4, 1); } -@@ -7087,19 +7087,19 @@ static void rt2800_init_rfcsr_3352(struct rt2x00_dev *rt2x00dev) +@@ -7087,19 +7087,19 @@ static void rt2800_init_rfcsr_3352(struc rt2800_rfcsr_write(rt2x00dev, 48, 0x14); rt2800_rfcsr_write(rt2x00dev, 49, 0x00); rfcsr = 0x2d; @@ -90,7 +88,7 @@ index 201b12ed90c6..ba06ac2d876d 100644 rt2800_rfcsr_write(rt2x00dev, 59, 0x00); rt2800_rfcsr_write(rt2x00dev, 60, 0x00); rt2800_rfcsr_write(rt2x00dev, 61, 0x00); -@@ -8782,13 +8782,13 @@ static int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev) +@@ -8782,13 +8782,13 @@ static int rt2800_init_eeprom(struct rt2 rt2800_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1, &eeprom); if (rt2x00_rt(rt2x00dev, RT3352)) { @@ -108,8 +106,6 @@ index 201b12ed90c6..ba06ac2d876d 100644 &rt2x00dev->cap_flags); } -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00.h b/drivers/net/wireless/ralink/rt2x00/rt2x00.h -index 8fdd2f9726ee..1bc353eafe37 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h @@ -719,8 +719,8 @@ enum rt2x00_capability_flags { @@ -123,6 +119,3 @@ index 8fdd2f9726ee..1bc353eafe37 100644 }; /* --- -2.12.2 - diff --git a/package/kernel/mac80211/patches/020-21-rt2800-fix-LNA-gain-assignment-for-MT7620.patch b/package/kernel/mac80211/patches/020-21-rt2800-fix-LNA-gain-assignment-for-MT7620.patch index 3270ea2c56..71a4ffea45 100644 --- a/package/kernel/mac80211/patches/020-21-rt2800-fix-LNA-gain-assignment-for-MT7620.patch +++ b/package/kernel/mac80211/patches/020-21-rt2800-fix-LNA-gain-assignment-for-MT7620.patch @@ -17,11 +17,9 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -index ba06ac2d876d..7135519a638c 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -@@ -3806,11 +3806,25 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev, +@@ -3806,11 +3806,25 @@ static void rt2800_config_channel(struct } if (rt2x00_rt(rt2x00dev, RT5592) || rt2x00_rt(rt2x00dev, RT6352)) { @@ -49,6 +47,3 @@ index ba06ac2d876d..7135519a638c 100644 rt2800_bbp_write_with_rx_chain(rt2x00dev, 66, reg); rt2800_iq_calibrate(rt2x00dev, rf->channel); --- -2.12.2 - diff --git a/package/kernel/mac80211/patches/020-22-rt2800-do-VCO-calibration-after-programming-ALC.patch b/package/kernel/mac80211/patches/020-22-rt2800-do-VCO-calibration-after-programming-ALC.patch index 1dafb78f1c..3d76408cd2 100644 --- a/package/kernel/mac80211/patches/020-22-rt2800-do-VCO-calibration-after-programming-ALC.patch +++ b/package/kernel/mac80211/patches/020-22-rt2800-do-VCO-calibration-after-programming-ALC.patch @@ -16,11 +16,9 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -index 7135519a638c..870bf315f98b 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -@@ -3407,6 +3407,8 @@ static void rt2800_config_alc(struct rt2x00_dev *rt2x00dev, +@@ -3407,6 +3407,8 @@ static void rt2800_config_alc(struct rt2 rt2800_rfcsr_write(rt2x00dev, 42, 0x5b); } rt2800_register_write(rt2x00dev, MAC_SYS_CTRL, mac_sys_ctrl); @@ -29,6 +27,3 @@ index 7135519a638c..870bf315f98b 100644 } static void rt2800_bbp_write_with_rx_chain(struct rt2x00_dev *rt2x00dev, --- -2.12.2 - diff --git a/package/kernel/mac80211/patches/020-23-rt2800-fix-mt7620-vco-calibration-registers.patch b/package/kernel/mac80211/patches/020-23-rt2800-fix-mt7620-vco-calibration-registers.patch index 708b0b2d31..360d06e8f8 100644 --- a/package/kernel/mac80211/patches/020-23-rt2800-fix-mt7620-vco-calibration-registers.patch +++ b/package/kernel/mac80211/patches/020-23-rt2800-fix-mt7620-vco-calibration-registers.patch @@ -21,11 +21,9 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -index 870bf315f98b..86cffee6876a 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -@@ -4932,7 +4932,7 @@ void rt2800_vco_calibration(struct rt2x00_dev *rt2x00dev) +@@ -4932,7 +4932,7 @@ void rt2800_vco_calibration(struct rt2x0 rt2800_register_write(rt2x00dev, TX_PIN_CFG, tx_pin); if (rt2x00_rt(rt2x00dev, RT6352)) { @@ -34,7 +32,7 @@ index 870bf315f98b..86cffee6876a 100644 rt2800_bbp_write(rt2x00dev, 91, 0x07); rt2800_bbp_write(rt2x00dev, 95, 0x1A); rt2800_bbp_write(rt2x00dev, 195, 128); -@@ -4953,8 +4953,8 @@ void rt2800_vco_calibration(struct rt2x00_dev *rt2x00dev) +@@ -4953,8 +4953,8 @@ void rt2800_vco_calibration(struct rt2x0 } if (rt2x00_has_cap_external_lna_bg(rt2x00dev)) { @@ -45,6 +43,3 @@ index 870bf315f98b..86cffee6876a 100644 rt2800_bbp_write(rt2x00dev, 79, 0x1C); rt2800_bbp_write(rt2x00dev, 80, 0x0C); rt2800_bbp_write(rt2x00dev, 82, 0xB6); --- -2.12.2 - diff --git a/package/kernel/mac80211/patches/020-24-rt2800-fix-mt7620-E2-channel-registers.patch b/package/kernel/mac80211/patches/020-24-rt2800-fix-mt7620-E2-channel-registers.patch index 284a347f25..92c2134845 100644 --- a/package/kernel/mac80211/patches/020-24-rt2800-fix-mt7620-E2-channel-registers.patch +++ b/package/kernel/mac80211/patches/020-24-rt2800-fix-mt7620-E2-channel-registers.patch @@ -18,11 +18,9 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -index 86cffee6876a..8585cdc3de53 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -@@ -8145,9 +8145,11 @@ static void rt2800_init_rfcsr_6352(struct rt2x00_dev *rt2x00dev) +@@ -8145,9 +8145,11 @@ static void rt2800_init_rfcsr_6352(struc rt2800_rfcsr_write_chanreg(rt2x00dev, 44, 0xB3); rt2800_rfcsr_write_chanreg(rt2x00dev, 45, 0xD5); rt2800_rfcsr_write_chanreg(rt2x00dev, 46, 0x27); @@ -36,6 +34,3 @@ index 86cffee6876a..8585cdc3de53 100644 rt2800_rfcsr_write_chanreg(rt2x00dev, 55, 0x66); rt2800_rfcsr_write_chanreg(rt2x00dev, 56, 0xFF); rt2800_rfcsr_write_chanreg(rt2x00dev, 57, 0x1C); --- -2.12.2 - diff --git a/package/kernel/mac80211/patches/326-ath9k-fix-ar934x-OTP-offsets.patch b/package/kernel/mac80211/patches/326-ath9k-fix-ar934x-OTP-offsets.patch index ae6a90fd4a..60de2b6d14 100644 --- a/package/kernel/mac80211/patches/326-ath9k-fix-ar934x-OTP-offsets.patch +++ b/package/kernel/mac80211/patches/326-ath9k-fix-ar934x-OTP-offsets.patch @@ -37,6 +37,6 @@ Signed-off-by: Chris Blake <chrisrblake93@gmail.com> #define AR9300_OTP_READ_DATA \ - ((AR_SREV_9340(ah) || AR_SREV_9550(ah)) ? 0x3001c : 0x15f1c) + ((AR_SREV_9340(ah) || AR_SREV_9550(ah)) ? 0x3101c : 0x15f1c) - + enum targetPowerHTRates { HT_TARGET_RATE_0_8_16, diff --git a/package/kernel/mac80211/patches/600-02-rt2x00-rt2800lib-enable-support-for-RT3883.patch b/package/kernel/mac80211/patches/600-02-rt2x00-rt2800lib-enable-support-for-RT3883.patch index 2325f37670..dc0f19490e 100644 --- a/package/kernel/mac80211/patches/600-02-rt2x00-rt2800lib-enable-support-for-RT3883.patch +++ b/package/kernel/mac80211/patches/600-02-rt2x00-rt2800lib-enable-support-for-RT3883.patch @@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -@@ -9379,6 +9379,7 @@ static int rt2800_probe_rt(struct rt2x00 +@@ -9397,6 +9397,7 @@ static int rt2800_probe_rt(struct rt2x00 case RT3390: case RT3572: case RT3593: diff --git a/package/kernel/mac80211/patches/600-03-rt2x00-rt2800lib-add-rf_vals-for-RF3853.patch b/package/kernel/mac80211/patches/600-03-rt2x00-rt2800lib-add-rf_vals-for-RF3853.patch index 9775664deb..45fc964504 100644 --- a/package/kernel/mac80211/patches/600-03-rt2x00-rt2800lib-add-rf_vals-for-RF3853.patch +++ b/package/kernel/mac80211/patches/600-03-rt2x00-rt2800lib-add-rf_vals-for-RF3853.patch @@ -31,7 +31,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> #define RF5362 0x5362 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -@@ -8957,6 +8957,66 @@ static const struct rf_channel rf_vals_3 +@@ -8975,6 +8975,66 @@ static const struct rf_channel rf_vals_3 {14, 0xF0, 2, 0x18}, }; @@ -98,7 +98,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> static const struct rf_channel rf_vals_5592_xtal20[] = { /* Channel, N, K, mod, R */ {1, 482, 4, 10, 3}, -@@ -9220,6 +9280,11 @@ static int rt2800_probe_hw_mode(struct r +@@ -9238,6 +9298,11 @@ static int rt2800_probe_hw_mode(struct r spec->channels = rf_vals_3x; break; diff --git a/package/kernel/mac80211/patches/600-04-rt2x00-rt2800lib-enable-VCO-calibration-for-RF3853.patch b/package/kernel/mac80211/patches/600-04-rt2x00-rt2800lib-enable-VCO-calibration-for-RF3853.patch index 5737e015c1..fb32b75d0a 100644 --- a/package/kernel/mac80211/patches/600-04-rt2x00-rt2800lib-enable-VCO-calibration-for-RF3853.patch +++ b/package/kernel/mac80211/patches/600-04-rt2x00-rt2800lib-enable-VCO-calibration-for-RF3853.patch @@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -@@ -4855,6 +4855,7 @@ void rt2800_vco_calibration(struct rt2x0 +@@ -4871,6 +4871,7 @@ void rt2800_vco_calibration(struct rt2x0 case RF3053: case RF3070: case RF3290: @@ -18,7 +18,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> case RF5350: case RF5360: case RF5362: -@@ -9402,6 +9403,7 @@ static int rt2800_probe_hw_mode(struct r +@@ -9420,6 +9421,7 @@ static int rt2800_probe_hw_mode(struct r case RF3053: case RF3070: case RF3290: diff --git a/package/kernel/mac80211/patches/600-05-rt2x00-rt2800lib-add-channel-configuration-function-.patch b/package/kernel/mac80211/patches/600-05-rt2x00-rt2800lib-add-channel-configuration-function-.patch index afcb6bdf4a..266a3fba50 100644 --- a/package/kernel/mac80211/patches/600-05-rt2x00-rt2800lib-add-channel-configuration-function-.patch +++ b/package/kernel/mac80211/patches/600-05-rt2x00-rt2800lib-add-channel-configuration-function-.patch @@ -223,7 +223,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> #define POWER_BOUND 0x27 #define POWER_BOUND_5G 0x2b -@@ -3565,6 +3770,9 @@ static void rt2800_config_channel(struct +@@ -3567,6 +3772,9 @@ static void rt2800_config_channel(struct case RF3322: rt2800_config_channel_rf3322(rt2x00dev, conf, rf, info); break; diff --git a/package/kernel/mac80211/patches/600-06-rt2x00-rt2800lib-enable-RF3853-support.patch b/package/kernel/mac80211/patches/600-06-rt2x00-rt2800lib-enable-RF3853-support.patch index 9579016595..53e6bbb155 100644 --- a/package/kernel/mac80211/patches/600-06-rt2x00-rt2800lib-enable-RF3853-support.patch +++ b/package/kernel/mac80211/patches/600-06-rt2x00-rt2800lib-enable-RF3853-support.patch @@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -@@ -8882,6 +8882,7 @@ static int rt2800_init_eeprom(struct rt2 +@@ -8900,6 +8900,7 @@ static int rt2800_init_eeprom(struct rt2 case RF3290: case RF3320: case RF3322: diff --git a/package/kernel/mac80211/patches/600-07-rt2x00-rt2800lib-add-MAC-register-initialization-for.patch b/package/kernel/mac80211/patches/600-07-rt2x00-rt2800lib-add-MAC-register-initialization-for.patch index 08b54f6726..cfa95e56bc 100644 --- a/package/kernel/mac80211/patches/600-07-rt2x00-rt2800lib-add-MAC-register-initialization-for.patch +++ b/package/kernel/mac80211/patches/600-07-rt2x00-rt2800lib-add-MAC-register-initialization-for.patch @@ -35,7 +35,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> #define RX_FILTER_CFG 0x1400 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -@@ -5485,6 +5485,12 @@ static int rt2800_init_registers(struct +@@ -5501,6 +5501,12 @@ static int rt2800_init_registers(struct rt2800_register_write(rt2x00dev, TX_SW_CFG2, 0x00000000); } @@ -48,7 +48,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> } else if (rt2x00_rt(rt2x00dev, RT5390) || rt2x00_rt(rt2x00dev, RT5392) || rt2x00_rt(rt2x00dev, RT6352)) { -@@ -5698,6 +5704,11 @@ static int rt2800_init_registers(struct +@@ -5714,6 +5720,11 @@ static int rt2800_init_registers(struct reg = rt2x00_rt(rt2x00dev, RT5592) ? 0x00000082 : 0x00000002; rt2800_register_write(rt2x00dev, TXOP_HLDR_ET, reg); diff --git a/package/kernel/mac80211/patches/600-09-rt2x00-rt2800lib-add-BBP-register-initialization-for.patch b/package/kernel/mac80211/patches/600-09-rt2x00-rt2800lib-add-BBP-register-initialization-for.patch index ced3645aef..6adb9e1cd2 100644 --- a/package/kernel/mac80211/patches/600-09-rt2x00-rt2800lib-add-BBP-register-initialization-for.patch +++ b/package/kernel/mac80211/patches/600-09-rt2x00-rt2800lib-add-BBP-register-initialization-for.patch @@ -11,7 +11,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -@@ -6325,6 +6325,47 @@ static void rt2800_init_bbp_3593(struct +@@ -6341,6 +6341,47 @@ static void rt2800_init_bbp_3593(struct rt2800_bbp_write(rt2x00dev, 103, 0xc0); } @@ -59,7 +59,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> static void rt2800_init_bbp_53xx(struct rt2x00_dev *rt2x00dev) { int ant, div_mode; -@@ -6769,6 +6810,9 @@ static void rt2800_init_bbp(struct rt2x0 +@@ -6785,6 +6826,9 @@ static void rt2800_init_bbp(struct rt2x0 case RT3593: rt2800_init_bbp_3593(rt2x00dev); return; diff --git a/package/kernel/mac80211/patches/600-10-rt2x00-rt2800lib-add-RFCSR-initialization-for-RT3883.patch b/package/kernel/mac80211/patches/600-10-rt2x00-rt2800lib-add-RFCSR-initialization-for-RT3883.patch index 08e4ffe9ba..aa3ead6ee8 100644 --- a/package/kernel/mac80211/patches/600-10-rt2x00-rt2800lib-add-RFCSR-initialization-for-RT3883.patch +++ b/package/kernel/mac80211/patches/600-10-rt2x00-rt2800lib-add-RFCSR-initialization-for-RT3883.patch @@ -21,7 +21,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> #define RFCSR2_TX2_EN_MT7620 FIELD8(0x20) --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -@@ -7685,6 +7685,144 @@ static void rt2800_init_rfcsr_5350(struc +@@ -7701,6 +7701,144 @@ static void rt2800_init_rfcsr_5350(struc rt2800_rfcsr_write(rt2x00dev, 63, 0x00); } @@ -166,7 +166,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> static void rt2800_init_rfcsr_5390(struct rt2x00_dev *rt2x00dev) { rt2800_rf_init_calibration(rt2x00dev, 2); -@@ -8525,6 +8663,9 @@ static void rt2800_init_rfcsr(struct rt2 +@@ -8543,6 +8681,9 @@ static void rt2800_init_rfcsr(struct rt2 case RT3390: rt2800_init_rfcsr_3390(rt2x00dev); break; diff --git a/package/kernel/mac80211/patches/600-12-rt2x00-rt2800lib-force-rf-type-to-RF3853-on-RT3883.patch b/package/kernel/mac80211/patches/600-12-rt2x00-rt2800lib-force-rf-type-to-RF3853-on-RT3883.patch index c03527b4f7..0ac7b040ec 100644 --- a/package/kernel/mac80211/patches/600-12-rt2x00-rt2800lib-force-rf-type-to-RF3853-on-RT3883.patch +++ b/package/kernel/mac80211/patches/600-12-rt2x00-rt2800lib-force-rf-type-to-RF3853-on-RT3883.patch @@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -@@ -9059,6 +9059,8 @@ static int rt2800_init_eeprom(struct rt2 +@@ -9077,6 +9077,8 @@ static int rt2800_init_eeprom(struct rt2 rt2800_eeprom_read(rt2x00dev, EEPROM_CHIP_ID, &rf); else if (rt2x00_rt(rt2x00dev, RT3352)) rf = RF3322; diff --git a/package/kernel/mac80211/patches/600-13-rt2x00-rt2800lib-add-channel-configuration-code-for-.patch b/package/kernel/mac80211/patches/600-13-rt2x00-rt2800lib-add-channel-configuration-code-for-.patch index 04574db7c1..dc34a96d99 100644 --- a/package/kernel/mac80211/patches/600-13-rt2x00-rt2800lib-add-channel-configuration-code-for-.patch +++ b/package/kernel/mac80211/patches/600-13-rt2x00-rt2800lib-add-channel-configuration-code-for-.patch @@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -@@ -3733,6 +3733,36 @@ static char rt2800_txpower_to_dev(struct +@@ -3735,6 +3735,36 @@ static char rt2800_txpower_to_dev(struct return clamp_t(char, txpower, MIN_A_TXPOWER, MAX_A_TXPOWER); } @@ -47,7 +47,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev, struct ieee80211_conf *conf, struct rf_channel *rf, -@@ -3751,6 +3781,12 @@ static void rt2800_config_channel(struct +@@ -3753,6 +3783,12 @@ static void rt2800_config_channel(struct rt2800_txpower_to_dev(rt2x00dev, rf->channel, info->default_power3); @@ -60,7 +60,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> switch (rt2x00dev->chip.rf) { case RF2020: case RF3020: -@@ -3855,6 +3891,15 @@ static void rt2800_config_channel(struct +@@ -3857,6 +3893,15 @@ static void rt2800_config_channel(struct rt2800_bbp_write(rt2x00dev, 63, 0x37 - rt2x00dev->lna_gain); rt2800_bbp_write(rt2x00dev, 64, 0x37 - rt2x00dev->lna_gain); rt2800_bbp_write(rt2x00dev, 77, 0x98); @@ -76,7 +76,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> } else { rt2800_bbp_write(rt2x00dev, 62, 0x37 - rt2x00dev->lna_gain); rt2800_bbp_write(rt2x00dev, 63, 0x37 - rt2x00dev->lna_gain); -@@ -3868,6 +3913,7 @@ static void rt2800_config_channel(struct +@@ -3870,6 +3915,7 @@ static void rt2800_config_channel(struct !rt2x00_rt(rt2x00dev, RT6352)) { if (rt2x00_has_cap_external_lna_bg(rt2x00dev)) { rt2800_bbp_write(rt2x00dev, 82, 0x62); @@ -84,7 +84,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> rt2800_bbp_write(rt2x00dev, 75, 0x46); } else { if (rt2x00_rt(rt2x00dev, RT3593)) -@@ -3876,19 +3922,22 @@ static void rt2800_config_channel(struct +@@ -3878,19 +3924,22 @@ static void rt2800_config_channel(struct rt2800_bbp_write(rt2x00dev, 82, 0x84); rt2800_bbp_write(rt2x00dev, 75, 0x50); } @@ -110,7 +110,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> rt2800_bbp_write(rt2x00dev, 83, 0x9a); if (rt2x00_has_cap_external_lna_a(rt2x00dev)) -@@ -4011,6 +4060,23 @@ static void rt2800_config_channel(struct +@@ -4013,6 +4062,23 @@ static void rt2800_config_channel(struct rt2800_bbp_write_with_rx_chain(rt2x00dev, 66, reg); diff --git a/package/kernel/mac80211/patches/600-14-rt2x00-rt2800lib-fix-txpower_to_dev-function-for-RT3.patch b/package/kernel/mac80211/patches/600-14-rt2x00-rt2800lib-fix-txpower_to_dev-function-for-RT3.patch index 3412a3e133..e93d2dd96f 100644 --- a/package/kernel/mac80211/patches/600-14-rt2x00-rt2800lib-fix-txpower_to_dev-function-for-RT3.patch +++ b/package/kernel/mac80211/patches/600-14-rt2x00-rt2800lib-fix-txpower_to_dev-function-for-RT3.patch @@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -@@ -3720,13 +3720,15 @@ static char rt2800_txpower_to_dev(struct +@@ -3722,13 +3722,15 @@ static char rt2800_txpower_to_dev(struct unsigned int channel, char txpower) { diff --git a/package/kernel/mac80211/patches/600-15-rt2x00-rt2800lib-use-correct-txpower-calculation-fun.patch b/package/kernel/mac80211/patches/600-15-rt2x00-rt2800lib-use-correct-txpower-calculation-fun.patch index 8d1df8cf77..463346eec4 100644 --- a/package/kernel/mac80211/patches/600-15-rt2x00-rt2800lib-use-correct-txpower-calculation-fun.patch +++ b/package/kernel/mac80211/patches/600-15-rt2x00-rt2800lib-use-correct-txpower-calculation-fun.patch @@ -11,7 +11,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -@@ -5085,7 +5085,8 @@ static void rt2800_config_txpower(struct +@@ -5101,7 +5101,8 @@ static void rt2800_config_txpower(struct struct ieee80211_channel *chan, int power_level) { diff --git a/package/kernel/mac80211/patches/600-16-rt2x00-rt2800lib-hardcode-txmixer-gain-values-to-zer.patch b/package/kernel/mac80211/patches/600-16-rt2x00-rt2800lib-hardcode-txmixer-gain-values-to-zer.patch index 9aeb41fe6b..3efac12246 100644 --- a/package/kernel/mac80211/patches/600-16-rt2x00-rt2800lib-hardcode-txmixer-gain-values-to-zer.patch +++ b/package/kernel/mac80211/patches/600-16-rt2x00-rt2800lib-hardcode-txmixer-gain-values-to-zer.patch @@ -11,7 +11,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -@@ -8941,7 +8941,8 @@ static u8 rt2800_get_txmixer_gain_24g(st +@@ -8959,7 +8959,8 @@ static u8 rt2800_get_txmixer_gain_24g(st { u16 word; @@ -21,7 +21,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> return 0; rt2800_eeprom_read(rt2x00dev, EEPROM_TXMIXER_GAIN_BG, &word); -@@ -8955,7 +8956,8 @@ static u8 rt2800_get_txmixer_gain_5g(str +@@ -8973,7 +8974,8 @@ static u8 rt2800_get_txmixer_gain_5g(str { u16 word; diff --git a/package/kernel/mac80211/patches/600-20-rt2x00-rt2800lib-fix-VGC-setup-for-RT3883.patch b/package/kernel/mac80211/patches/600-20-rt2x00-rt2800lib-fix-VGC-setup-for-RT3883.patch index 70c33a1d20..8c563b8938 100644 --- a/package/kernel/mac80211/patches/600-20-rt2x00-rt2800lib-fix-VGC-setup-for-RT3883.patch +++ b/package/kernel/mac80211/patches/600-20-rt2x00-rt2800lib-fix-VGC-setup-for-RT3883.patch @@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -@@ -5338,7 +5338,8 @@ static u8 rt2800_get_default_vgc(struct +@@ -5354,7 +5354,8 @@ static u8 rt2800_get_default_vgc(struct else vgc = 0x2e + rt2x00dev->lna_gain; } else { /* 5GHZ band */ @@ -20,7 +20,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> vgc = 0x20 + (rt2x00dev->lna_gain * 5) / 3; else if (rt2x00_rt(rt2x00dev, RT5592)) vgc = 0x24 + (2 * rt2x00dev->lna_gain); -@@ -5358,7 +5359,8 @@ static inline void rt2800_set_vgc(struct +@@ -5374,7 +5375,8 @@ static inline void rt2800_set_vgc(struct { if (qual->vgc_level != vgc_level) { if (rt2x00_rt(rt2x00dev, RT3572) || @@ -30,7 +30,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> rt2800_bbp_write_with_rx_chain(rt2x00dev, 66, vgc_level); } else if (rt2x00_rt(rt2x00dev, RT5592)) { -@@ -5405,6 +5407,11 @@ void rt2800_link_tuner(struct rt2x00_dev +@@ -5421,6 +5423,11 @@ void rt2800_link_tuner(struct rt2x00_dev } break; diff --git a/package/kernel/mac80211/patches/600-21-rt2x00-rt2800lib-fix-EEPROM-LNA-validation-for-RT388.patch b/package/kernel/mac80211/patches/600-21-rt2x00-rt2800lib-fix-EEPROM-LNA-validation-for-RT388.patch index a2cfd896eb..6e9ef1071c 100644 --- a/package/kernel/mac80211/patches/600-21-rt2x00-rt2800lib-fix-EEPROM-LNA-validation-for-RT388.patch +++ b/package/kernel/mac80211/patches/600-21-rt2x00-rt2800lib-fix-EEPROM-LNA-validation-for-RT388.patch @@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -@@ -9074,7 +9074,8 @@ static int rt2800_validate_eeprom(struct +@@ -9092,7 +9092,8 @@ static int rt2800_validate_eeprom(struct rt2800_eeprom_read(rt2x00dev, EEPROM_RSSI_BG2, &word); if (abs(rt2x00_get_field16(word, EEPROM_RSSI_BG2_OFFSET2)) > 10) rt2x00_set_field16(&word, EEPROM_RSSI_BG2_OFFSET2, 0); @@ -20,7 +20,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> if (rt2x00_get_field16(word, EEPROM_RSSI_BG2_LNA_A1) == 0x00 || rt2x00_get_field16(word, EEPROM_RSSI_BG2_LNA_A1) == 0xff) rt2x00_set_field16(&word, EEPROM_RSSI_BG2_LNA_A1, -@@ -9094,7 +9095,8 @@ static int rt2800_validate_eeprom(struct +@@ -9112,7 +9113,8 @@ static int rt2800_validate_eeprom(struct rt2800_eeprom_read(rt2x00dev, EEPROM_RSSI_A2, &word); if (abs(rt2x00_get_field16(word, EEPROM_RSSI_A2_OFFSET2)) > 10) rt2x00_set_field16(&word, EEPROM_RSSI_A2_OFFSET2, 0); @@ -30,7 +30,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> if (rt2x00_get_field16(word, EEPROM_RSSI_A2_LNA_A2) == 0x00 || rt2x00_get_field16(word, EEPROM_RSSI_A2_LNA_A2) == 0xff) rt2x00_set_field16(&word, EEPROM_RSSI_A2_LNA_A2, -@@ -9102,7 +9104,8 @@ static int rt2800_validate_eeprom(struct +@@ -9120,7 +9122,8 @@ static int rt2800_validate_eeprom(struct } rt2800_eeprom_write(rt2x00dev, EEPROM_RSSI_A2, word); diff --git a/package/kernel/mac80211/patches/600-22-rt2x00-rt2800lib-fix-txpower-compensation-for-RT3883.patch b/package/kernel/mac80211/patches/600-22-rt2x00-rt2800lib-fix-txpower-compensation-for-RT3883.patch index ac8b219efd..1a8ccbc9bd 100644 --- a/package/kernel/mac80211/patches/600-22-rt2x00-rt2800lib-fix-txpower-compensation-for-RT3883.patch +++ b/package/kernel/mac80211/patches/600-22-rt2x00-rt2800lib-fix-txpower-compensation-for-RT3883.patch @@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -@@ -4332,6 +4332,9 @@ static u8 rt2800_compensate_txpower(stru +@@ -4348,6 +4348,9 @@ static u8 rt2800_compensate_txpower(stru if (rt2x00_rt(rt2x00dev, RT3593)) return min_t(u8, txpower, 0xc); diff --git a/package/kernel/mac80211/patches/610-rt2x00-change-led-polarity-from-OF.patch b/package/kernel/mac80211/patches/610-rt2x00-change-led-polarity-from-OF.patch index 0236683d5f..51890e0a3b 100644 --- a/package/kernel/mac80211/patches/610-rt2x00-change-led-polarity-from-OF.patch +++ b/package/kernel/mac80211/patches/610-rt2x00-change-led-polarity-from-OF.patch @@ -8,7 +8,7 @@ #include "rt2x00.h" #include "rt2800lib.h" -@@ -9261,6 +9262,17 @@ static int rt2800_init_eeprom(struct rt2 +@@ -9279,6 +9280,17 @@ static int rt2800_init_eeprom(struct rt2 rt2800_init_led(rt2x00dev, &rt2x00dev->led_assoc, LED_TYPE_ASSOC); rt2800_init_led(rt2x00dev, &rt2x00dev->led_qual, LED_TYPE_QUALITY); diff --git a/package/kernel/mac80211/patches/650-rt2x00-add-support-for-external-PA-on-MT7620.patch b/package/kernel/mac80211/patches/650-rt2x00-add-support-for-external-PA-on-MT7620.patch index b2248614a3..64a62f4b07 100644 --- a/package/kernel/mac80211/patches/650-rt2x00-add-support-for-external-PA-on-MT7620.patch +++ b/package/kernel/mac80211/patches/650-rt2x00-add-support-for-external-PA-on-MT7620.patch @@ -13,11 +13,9 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 70 +++++++++++++++++++++++++- 2 files changed, 70 insertions(+), 1 deletion(-) -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800.h b/drivers/net/wireless/ralink/rt2x00/rt2800.h -index 6a8c93fb6a43..df0cefe44171 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800.h +++ b/drivers/net/wireless/ralink/rt2x00/rt2800.h -@@ -2732,6 +2732,7 @@ enum rt2800_eeprom_word { +@@ -2749,6 +2749,7 @@ enum rt2800_eeprom_word { #define EEPROM_NIC_CONF2_RX_STREAM FIELD16(0x000f) #define EEPROM_NIC_CONF2_TX_STREAM FIELD16(0x00f0) #define EEPROM_NIC_CONF2_CRYSTAL FIELD16(0x0600) @@ -25,11 +23,9 @@ index 6a8c93fb6a43..df0cefe44171 100644 /* * EEPROM LNA -diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -index c06db547b0a4..db431c9544e2 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -@@ -3834,6 +3834,61 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev, +@@ -4114,6 +4114,61 @@ static void rt2800_config_channel(struct rt2800_iq_calibrate(rt2x00dev, rf->channel); } @@ -91,7 +87,7 @@ index c06db547b0a4..db431c9544e2 100644 rt2800_bbp_read(rt2x00dev, 4, &bbp); rt2x00_set_field8(&bbp, BBP4_BANDWIDTH, 2 * conf_is_ht40(conf)); rt2800_bbp_write(rt2x00dev, 4, bbp); -@@ -8796,7 +8851,8 @@ static int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev) +@@ -9308,7 +9363,8 @@ static int rt2800_init_eeprom(struct rt2 */ rt2800_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1, &eeprom); @@ -101,7 +97,7 @@ index c06db547b0a4..db431c9544e2 100644 if (rt2x00_get_field16(eeprom, EEPROM_NIC_CONF1_EXTERNAL_TX0_PA_3352)) __set_bit(CAPABILITY_EXTERNAL_PA_TX0, -@@ -8807,6 +8863,18 @@ static int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev) +@@ -9319,6 +9375,18 @@ static int rt2800_init_eeprom(struct rt2 &rt2x00dev->cap_flags); } @@ -120,6 +116,3 @@ index c06db547b0a4..db431c9544e2 100644 return 0; } --- -2.12.2 - diff --git a/package/kernel/mac80211/patches/651-rt2x00-remove-unneccesary-code.patch b/package/kernel/mac80211/patches/651-rt2x00-remove-unneccesary-code.patch index 6c913fba14..b65bd7a73e 100644 --- a/package/kernel/mac80211/patches/651-rt2x00-remove-unneccesary-code.patch +++ b/package/kernel/mac80211/patches/651-rt2x00-remove-unneccesary-code.patch @@ -73,11 +73,9 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> [daniel@makrotopia.org: fixed white-space so patch applies] --- -Index: compat-wireless-2017-01-31/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -=================================================================== ---- compat-wireless-2017-01-31.orig/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -+++ compat-wireless-2017-01-31/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -@@ -4137,38 +4137,22 @@ static void rt2800_config_channel(struct +--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c ++++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +@@ -4127,38 +4127,22 @@ static void rt2800_config_channel(struct reg |= 0x00000101; rt2800_register_write(rt2x00dev, RF_BYPASS3, reg); |