mac80211: refresh patches

Signed-off-by: Felix Fietkau <nbd@nbd.name>

1 files changed, 12 insertions, 35 deletions

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
-