mac80211: update rtl8xxxu patches

Adds the latest patches from Jes Sorensen for rtl8xxxu, which improve
rtl8732bu, rtl8192eu and rtl8188eu support.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>

63 files changed, 616 insertions, 98 deletions

diff --git a/package/kernel/mac80211/patches/657-0056-rtl8xxxu-Fix-memory-leak-in-handling-rxdesc16-packet.patch b/package/kernel/mac80211/patches/657-0001-rtl8xxxu-Fix-memory-leak-in-handling-rxdesc16-packet.patch
index 15371f0477..31604b6264 100644
--- a/package/kernel/mac80211/patches/657-0056-rtl8xxxu-Fix-memory-leak-in-handling-rxdesc16-packet.patch
+++ b/package/kernel/mac80211/patches/657-0001-rtl8xxxu-Fix-memory-leak-in-handling-rxdesc16-packet.patch
@@ -1,4 +1,4 @@
-From 5214760261aead3d3546b594e5b7021514ef76d1 Mon Sep 17 00:00:00 2001
+From 51be39337a10a8bf9d8ec65419e78b76bf5adf60 Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Wed, 28 Sep 2016 14:48:51 -0400
 Subject: [PATCH] rtl8xxxu: Fix memory leak in handling rxdesc16 packets
@@ -18,7 +18,7 @@ Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
 
 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
 +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
-@@ -5296,7 +5296,12 @@ int rtl8xxxu_parse_rxdesc16(struct rtl8x
+@@ -5197,7 +5197,12 @@ int rtl8xxxu_parse_rxdesc16(struct rtl8x
  		pkt_offset = roundup(pkt_len + drvinfo_sz + desc_shift +
  				     sizeof(struct rtl8xxxu_rxdesc16), 128);
  
diff --git a/package/kernel/mac80211/patches/657-0057-rtl8xxxu-Fix-big-endian-problem-reporting-mactime.patch b/package/kernel/mac80211/patches/657-0002-rtl8xxxu-Fix-big-endian-problem-reporting-mactime.patch
index 709e4919a3..7531d510b8 100644
--- a/package/kernel/mac80211/patches/657-0057-rtl8xxxu-Fix-big-endian-problem-reporting-mactime.patch
+++ b/package/kernel/mac80211/patches/657-0002-rtl8xxxu-Fix-big-endian-problem-reporting-mactime.patch
@@ -1,4 +1,4 @@
-From 7faf4fcaf3b9eba762b6ff780dcc21ec640ad17f Mon Sep 17 00:00:00 2001
+From 8d829444c8a860ba69ca8c51b9b609e29eaa4596 Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Wed, 28 Sep 2016 15:43:42 -0400
 Subject: [PATCH] rtl8xxxu: Fix big-endian problem reporting mactime
@@ -14,7 +14,7 @@ Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
 
 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
 +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
-@@ -244,7 +244,7 @@ struct rtl8xxxu_rxdesc16 {
+@@ -238,7 +238,7 @@ struct rtl8xxxu_rxdesc16 {
  	u32 pattern1match:1;
  	u32 pattern0match:1;
  #endif
@@ -23,7 +23,7 @@ Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
  #if 0
  	u32 bassn:12;
  	u32 bavld:1;
-@@ -374,7 +374,7 @@ struct rtl8xxxu_rxdesc24 {
+@@ -368,7 +368,7 @@ struct rtl8xxxu_rxdesc24 {
  	u32 ldcp:1;
  	u32 splcp:1;
  #endif
@@ -34,7 +34,7 @@ Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
  struct rtl8xxxu_txdesc32 {
 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
 +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
-@@ -5319,7 +5319,7 @@ int rtl8xxxu_parse_rxdesc16(struct rtl8x
+@@ -5220,7 +5220,7 @@ int rtl8xxxu_parse_rxdesc16(struct rtl8x
  			rtl8xxxu_rx_parse_phystats(priv, rx_status, phy_stats,
  						   rx_desc->rxmcs);
  
@@ -43,7 +43,7 @@ Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
  		rx_status->flag |= RX_FLAG_MACTIME_START;
  
  		if (!rx_desc->swdec)
-@@ -5389,7 +5389,7 @@ int rtl8xxxu_parse_rxdesc24(struct rtl8x
+@@ -5290,7 +5290,7 @@ int rtl8xxxu_parse_rxdesc24(struct rtl8x
  		rtl8xxxu_rx_parse_phystats(priv, rx_status, phy_stats,
  					   rx_desc->rxmcs);
  
diff --git a/package/kernel/mac80211/patches/658-0001-rtl8xxxu-Fix-rtl8723bu-driver-reload-issue.patch b/package/kernel/mac80211/patches/658-0001-rtl8xxxu-Fix-rtl8723bu-driver-reload-issue.patch
new file mode 100644
index 0000000000..600317c493
--- /dev/null
+++ b/package/kernel/mac80211/patches/658-0001-rtl8xxxu-Fix-rtl8723bu-driver-reload-issue.patch
@@ -0,0 +1,30 @@
+From ee286f4b57536ec4a7c1b52d0a3476f8e52594d5 Mon Sep 17 00:00:00 2001
+From: Jes Sorensen <Jes.Sorensen@redhat.com>
+Date: Fri, 30 Sep 2016 16:39:39 -0400
+Subject: [PATCH] rtl8xxxu: Fix rtl8723bu driver reload issue
+
+The generic disable_rf() function clears bits 22 and 23 in
+REG_RX_WAIT_CCA, however we did not re-enable them again in
+rtl8723b_enable_rf()
+
+This resolves the problem for me with 8723bu devices not working again
+after reloading the driver.
+
+Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
+---
+ drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c
++++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c
+@@ -1498,6 +1498,10 @@ static void rtl8723b_enable_rf(struct rt
+ 	u32 val32;
+ 	u8 val8;
+ 
++	val32 = rtl8xxxu_read32(priv, REG_RX_WAIT_CCA);
++	val32 |= (BIT(22) | BIT(23));
++	rtl8xxxu_write32(priv, REG_RX_WAIT_CCA, val32);
++
+ 	/*
+ 	 * No indication anywhere as to what 0x0790 does. The 2 antenna
+ 	 * vendor code preserves bits 6-7 here.
diff --git a/package/kernel/mac80211/patches/658-0002-rtl8xxxu-Fix-rtl8192eu-driver-reload-issue.patch b/package/kernel/mac80211/patches/658-0002-rtl8xxxu-Fix-rtl8192eu-driver-reload-issue.patch
new file mode 100644
index 0000000000..ba7477b3d3
--- /dev/null
+++ b/package/kernel/mac80211/patches/658-0002-rtl8xxxu-Fix-rtl8192eu-driver-reload-issue.patch
@@ -0,0 +1,46 @@
+From 93064d0ae3e9d97c03a3aabd71e6048e1ac82f46 Mon Sep 17 00:00:00 2001
+From: Jes Sorensen <Jes.Sorensen@redhat.com>
+Date: Fri, 30 Sep 2016 19:18:34 -0400
+Subject: [PATCH] rtl8xxxu: Fix rtl8192eu driver reload issue
+
+The 8192eu suffered from two issues when reloading the driver.
+
+The same problems as with the 8723bu where REG_RX_WAIT_CCA bits 22 and
+23 didn't get set in rtl8192e_enable_rf().
+
+In addition it also seems prone to issues when setting REG_RF_CTRL to
+0 intead of just disabling the RF_ENABLE bit. Similar to what was
+causing issues with the 8188eu.
+
+With this patch I can successfully reload the driver and reassociate
+to an APi with an 8192eu dongle.
+
+Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
+---
+ drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c
++++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c
+@@ -1461,7 +1461,9 @@ static int rtl8192eu_active_to_emu(struc
+ 	int count, ret = 0;
+ 
+ 	/* Turn off RF */
+-	rtl8xxxu_write8(priv, REG_RF_CTRL, 0);
++	val8 = rtl8xxxu_read8(priv, REG_RF_CTRL);
++	val8 &= ~RF_ENABLE;
++	rtl8xxxu_write8(priv, REG_RF_CTRL, val8);
+ 
+ 	/* Switch DPDT_SEL_P output from register 0x65[2] */
+ 	val8 = rtl8xxxu_read8(priv, REG_LEDCFG2);
+@@ -1593,6 +1595,10 @@ static void rtl8192e_enable_rf(struct rt
+ 	u32 val32;
+ 	u8 val8;
+ 
++	val32 = rtl8xxxu_read32(priv, REG_RX_WAIT_CCA);
++	val32 |= (BIT(22) | BIT(23));
++	rtl8xxxu_write32(priv, REG_RX_WAIT_CCA, val32);
++
+ 	val8 = rtl8xxxu_read8(priv, REG_GPIO_MUXCFG);
+ 	val8 |= BIT(5);
+ 	rtl8xxxu_write8(priv, REG_GPIO_MUXCFG, val8);
diff --git a/package/kernel/mac80211/patches/659-0001-rtl8xxxu-Obtain-RTS-rates-from-mac80211.patch b/package/kernel/mac80211/patches/659-0001-rtl8xxxu-Obtain-RTS-rates-from-mac80211.patch
new file mode 100644
index 0000000000..3ebc685f6a
--- /dev/null
+++ b/package/kernel/mac80211/patches/659-0001-rtl8xxxu-Obtain-RTS-rates-from-mac80211.patch
@@ -0,0 +1,138 @@
+From 3d1d6d96f14881c421860973b4eb4b2fff7cb812 Mon Sep 17 00:00:00 2001
+From: Jes Sorensen <Jes.Sorensen@redhat.com>
+Date: Wed, 5 Oct 2016 16:04:54 -0400
+Subject: [PATCH] rtl8xxxu: Obtain RTS rates from mac80211
+
+Use the mac80211 provided rate for RTS rather than the hard coded
+24Mbps as suggested by the vendor drivers.
+
+Reported-by: Andrea Merello <andrea.merello@gmail.com>
+Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
+---
+ drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h   |  6 +--
+ .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c  | 46 ++++++++++++++--------
+ 2 files changed, 32 insertions(+), 20 deletions(-)
+
+--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
++++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
+@@ -1340,7 +1340,7 @@ struct rtl8xxxu_fileops {
+ 	void (*fill_txdesc) (struct ieee80211_hdr *hdr,
+ 			     struct rtl8xxxu_txdesc32 *tx_desc, u32 rate,
+ 			     u16 rate_flag, bool sgi, bool short_preamble,
+-			     bool ampdu_enable);
++			     bool ampdu_enable, u32 rts_rate);
+ 	int writeN_block_size;
+ 	int rx_agg_buf_size;
+ 	char tx_desc_size;
+@@ -1437,11 +1437,11 @@ bool rtl8xxxu_gen2_simularity_compare(st
+ void rtl8xxxu_fill_txdesc_v1(struct ieee80211_hdr *hdr,
+ 			     struct rtl8xxxu_txdesc32 *tx_desc, u32 rate,
+ 			     u16 rate_flag, bool sgi, bool short_preamble,
+-			     bool ampdu_enable);
++			     bool ampdu_enable, u32 rts_rate);
+ void rtl8xxxu_fill_txdesc_v2(struct ieee80211_hdr *hdr,
+ 			     struct rtl8xxxu_txdesc32 *tx_desc32, u32 rate,
+ 			     u16 rate_flag, bool sgi, bool short_preamble,
+-			     bool ampdu_enable);
++			     bool ampdu_enable, u32 rts_rate);
+ 
+ extern struct rtl8xxxu_fileops rtl8192cu_fops;
+ extern struct rtl8xxxu_fileops rtl8192eu_fops;
+--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
++++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
+@@ -4762,7 +4762,7 @@ void
+ rtl8xxxu_fill_txdesc_v1(struct ieee80211_hdr *hdr,
+ 			struct rtl8xxxu_txdesc32 *tx_desc, u32 rate,
+ 			u16 rate_flag, bool sgi, bool short_preamble,
+-			bool ampdu_enable)
++			bool ampdu_enable, u32 rts_rate)
+ {
+ 	u16 seq_number;
+ 
+@@ -4796,15 +4796,16 @@ rtl8xxxu_fill_txdesc_v1(struct ieee80211
+ 	if (sgi)
+ 		tx_desc->txdw5 |= cpu_to_le32(TXDESC32_SHORT_GI);
+ 
++	/*
++	 * rts_rate is zero if RTS/CTS or CTS to SELF are not enabled
++	 */
++	tx_desc->txdw4 |= cpu_to_le32(rts_rate << TXDESC32_RTS_RATE_SHIFT);
+ 	if (rate_flag & IEEE80211_TX_RC_USE_RTS_CTS) {
+-		/*
+-		 * Use RTS rate 24M - does the mac80211 tell
+-		 * us which to use?
+-		 */
+-		tx_desc->txdw4 |= cpu_to_le32(DESC_RATE_24M <<
+-					      TXDESC32_RTS_RATE_SHIFT);
+ 		tx_desc->txdw4 |= cpu_to_le32(TXDESC32_RTS_CTS_ENABLE);
+ 		tx_desc->txdw4 |= cpu_to_le32(TXDESC32_HW_RTS_ENABLE);
++	} else if (rate_flag & IEEE80211_TX_RC_USE_CTS_PROTECT) {
++		tx_desc->txdw4 |= cpu_to_le32(TXDESC32_CTS_SELF_ENABLE);
++		tx_desc->txdw4 |= cpu_to_le32(TXDESC32_HW_RTS_ENABLE);
+ 	}
+ }
+ 
+@@ -4816,7 +4817,7 @@ void
+ rtl8xxxu_fill_txdesc_v2(struct ieee80211_hdr *hdr,
+ 			struct rtl8xxxu_txdesc32 *tx_desc32, u32 rate,
+ 			u16 rate_flag, bool sgi, bool short_preamble,
+-			bool ampdu_enable)
++			bool ampdu_enable, u32 rts_rate)
+ {
+ 	struct rtl8xxxu_txdesc40 *tx_desc40;
+ 	u16 seq_number;
+@@ -4849,15 +4850,19 @@ rtl8xxxu_fill_txdesc_v2(struct ieee80211
+ 	if (short_preamble)
+ 		tx_desc40->txdw5 |= cpu_to_le32(TXDESC40_SHORT_PREAMBLE);
+ 
++	tx_desc40->txdw4 |= cpu_to_le32(rts_rate << TXDESC40_RTS_RATE_SHIFT);
++	/*
++	 * rts_rate is zero if RTS/CTS or CTS to SELF are not enabled
++	 */
+ 	if (rate_flag & IEEE80211_TX_RC_USE_RTS_CTS) {
+-		/*
+-		 * Use RTS rate 24M - does the mac80211 tell
+-		 * us which to use?
+-		 */
+-		tx_desc40->txdw4 |= cpu_to_le32(DESC_RATE_24M <<
+-						TXDESC40_RTS_RATE_SHIFT);
+ 		tx_desc40->txdw3 |= cpu_to_le32(TXDESC40_RTS_CTS_ENABLE);
+ 		tx_desc40->txdw3 |= cpu_to_le32(TXDESC40_HW_RTS_ENABLE);
++	} else if (rate_flag & IEEE80211_TX_RC_USE_CTS_PROTECT) {
++		/*
++		 * For some reason the vendor driver doesn't set
++		 * TXDESC40_HW_RTS_ENABLE for CTS to SELF
++		 */
++		tx_desc40->txdw3 |= cpu_to_le32(TXDESC40_CTS_SELF_ENABLE);
+ 	}
+ }
+ 
+@@ -4874,7 +4879,7 @@ static void rtl8xxxu_tx(struct ieee80211
+ 	struct ieee80211_sta *sta = NULL;
+ 	struct ieee80211_vif *vif = tx_info->control.vif;
+ 	struct device *dev = &priv->udev->dev;
+-	u32 queue, rate;
++	u32 queue, rate, rts_rate;
+ 	u16 pktlen = skb->len;
+ 	u16 seq_number;
+ 	u16 rate_flag = tx_info->control.rates[0].flags;
+@@ -4974,10 +4979,17 @@ static void rtl8xxxu_tx(struct ieee80211
+ 	    (sta && vif && vif->bss_conf.use_short_preamble))
+ 		short_preamble = true;
+ 
++	if (rate_flag & IEEE80211_TX_RC_USE_RTS_CTS)
++		rts_rate = ieee80211_get_rts_cts_rate(hw, tx_info)->hw_value;
++	else if (rate_flag & IEEE80211_TX_RC_USE_CTS_PROTECT)
++		rts_rate = ieee80211_get_rts_cts_rate(hw, tx_info)->hw_value;
++	else
++		rts_rate = 0;
++
+ 	seq_number = IEEE80211_SEQ_TO_SN(le16_to_cpu(hdr->seq_ctrl));
+ 
+-	priv->fops->fill_txdesc(hdr, tx_desc, rate, rate_flag,
+-				sgi, short_preamble, ampdu_enable);
++	priv->fops->fill_txdesc(hdr, tx_desc, rate, rate_flag, sgi,
++				short_preamble, ampdu_enable, rts_rate);
+ 
+ 	rtl8xxxu_calc_tx_desc_csum(tx_desc);
+ 
diff --git a/package/kernel/mac80211/patches/659-0002-rtl8xxxu-Pass-tx_info-to-fill_txdesc-in-order-to-hav.patch b/package/kernel/mac80211/patches/659-0002-rtl8xxxu-Pass-tx_info-to-fill_txdesc-in-order-to-hav.patch
new file mode 100644
index 0000000000..4b81a9d422
--- /dev/null
+++ b/package/kernel/mac80211/patches/659-0002-rtl8xxxu-Pass-tx_info-to-fill_txdesc-in-order-to-hav.patch
@@ -0,0 +1,213 @@
+From f958b1e0806c045830d78c4287fbcddf9e5fd9d0 Mon Sep 17 00:00:00 2001
+From: Jes Sorensen <Jes.Sorensen@redhat.com>
+Date: Thu, 6 Oct 2016 21:08:53 -0400
+Subject: [PATCH] rtl8xxxu: Pass tx_info to fill_txdesc in order to have access
+ to retry count
+
+In order to obtain retry count for a given rate we need to pass the
+full struct ieee80211_tx_info to the function setting the rate in he
+TX descriptor.
+
+This uncovered a huge bug where the old code would use struct
+ieee80211_rate.flags to test for rate parameters, which is always
+zero, instead of the flags value from struct ieee80211_tx_rate.
+
+Time to find a brown paper bag :(
+
+Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
+---
+ drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h   | 27 ++++----
+ .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c  | 71 ++++++++++++++--------
+ 2 files changed, 60 insertions(+), 38 deletions(-)
+
+--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
++++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
+@@ -1337,10 +1337,11 @@ struct rtl8xxxu_fileops {
+ 				  u32 ramask, int sgi);
+ 	void (*report_connect) (struct rtl8xxxu_priv *priv,
+ 				u8 macid, bool connect);
+-	void (*fill_txdesc) (struct ieee80211_hdr *hdr,
+-			     struct rtl8xxxu_txdesc32 *tx_desc, u32 rate,
+-			     u16 rate_flag, bool sgi, bool short_preamble,
+-			     bool ampdu_enable, u32 rts_rate);
++	void (*fill_txdesc) (struct ieee80211_hw *hw, struct ieee80211_hdr *hdr,
++			     struct ieee80211_tx_info *tx_info,
++			     struct rtl8xxxu_txdesc32 *tx_desc, bool sgi,
++			     bool short_preamble, bool ampdu_enable,
++			     u32 rts_rate);
+ 	int writeN_block_size;
+ 	int rx_agg_buf_size;
+ 	char tx_desc_size;
+@@ -1434,14 +1435,16 @@ int rtl8xxxu_parse_rxdesc24(struct rtl8x
+ int rtl8xxxu_gen2_channel_to_group(int channel);
+ bool rtl8xxxu_gen2_simularity_compare(struct rtl8xxxu_priv *priv,
+ 				      int result[][8], int c1, int c2);
+-void rtl8xxxu_fill_txdesc_v1(struct ieee80211_hdr *hdr,
+-			     struct rtl8xxxu_txdesc32 *tx_desc, u32 rate,
+-			     u16 rate_flag, bool sgi, bool short_preamble,
+-			     bool ampdu_enable, u32 rts_rate);
+-void rtl8xxxu_fill_txdesc_v2(struct ieee80211_hdr *hdr,
+-			     struct rtl8xxxu_txdesc32 *tx_desc32, u32 rate,
+-			     u16 rate_flag, bool sgi, bool short_preamble,
+-			     bool ampdu_enable, u32 rts_rate);
++void rtl8xxxu_fill_txdesc_v1(struct ieee80211_hw *hw, struct ieee80211_hdr *hdr,
++			     struct ieee80211_tx_info *tx_info,
++			     struct rtl8xxxu_txdesc32 *tx_desc, bool sgi,
++			     bool short_preamble, bool ampdu_enable,
++			     u32 rts_rate);
++void rtl8xxxu_fill_txdesc_v2(struct ieee80211_hw *hw, struct ieee80211_hdr *hdr,
++			     struct ieee80211_tx_info *tx_info,
++			     struct rtl8xxxu_txdesc32 *tx_desc32, bool sgi,
++			     bool short_preamble, bool ampdu_enable,
++			     u32 rts_rate);
+ 
+ extern struct rtl8xxxu_fileops rtl8192cu_fops;
+ extern struct rtl8xxxu_fileops rtl8192eu_fops;
+--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
++++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
+@@ -4759,13 +4759,28 @@ static void rtl8xxxu_dump_action(struct
+  * This format is used on 8188cu/8192cu/8723au
+  */
+ void
+-rtl8xxxu_fill_txdesc_v1(struct ieee80211_hdr *hdr,
+-			struct rtl8xxxu_txdesc32 *tx_desc, u32 rate,
+-			u16 rate_flag, bool sgi, bool short_preamble,
+-			bool ampdu_enable, u32 rts_rate)
++rtl8xxxu_fill_txdesc_v1(struct ieee80211_hw *hw, struct ieee80211_hdr *hdr,
++			struct ieee80211_tx_info *tx_info,
++			struct rtl8xxxu_txdesc32 *tx_desc, bool sgi,
++			bool short_preamble, bool ampdu_enable, u32 rts_rate)
+ {
++	struct ieee80211_rate *tx_rate = ieee80211_get_tx_rate(hw, tx_info);
++	struct rtl8xxxu_priv *priv = hw->priv;
++	struct device *dev = &priv->udev->dev;
++	u32 rate;
++	u16 rate_flags = tx_info->control.rates[0].flags;
+ 	u16 seq_number;
+ 
++	if (rate_flags & IEEE80211_TX_RC_MCS &&
++	    !ieee80211_is_mgmt(hdr->frame_control))
++		rate = tx_info->control.rates[0].idx + DESC_RATE_MCS0;
++	else
++		rate = tx_rate->hw_value;
++
++	if (rtl8xxxu_debug & RTL8XXXU_DEBUG_TX)
++		dev_info(dev, "%s: TX rate: %d, pkt size %d\n",
++			 __func__, rate, cpu_to_le16(tx_desc->pkt_size));
++
+ 	seq_number = IEEE80211_SEQ_TO_SN(le16_to_cpu(hdr->seq_ctrl));
+ 
+ 	tx_desc->txdw5 = cpu_to_le32(rate);
+@@ -4800,10 +4815,10 @@ rtl8xxxu_fill_txdesc_v1(struct ieee80211
+ 	 * rts_rate is zero if RTS/CTS or CTS to SELF are not enabled
+ 	 */
+ 	tx_desc->txdw4 |= cpu_to_le32(rts_rate << TXDESC32_RTS_RATE_SHIFT);
+-	if (rate_flag & IEEE80211_TX_RC_USE_RTS_CTS) {
++	if (rate_flags & IEEE80211_TX_RC_USE_RTS_CTS) {
+ 		tx_desc->txdw4 |= cpu_to_le32(TXDESC32_RTS_CTS_ENABLE);
+ 		tx_desc->txdw4 |= cpu_to_le32(TXDESC32_HW_RTS_ENABLE);
+-	} else if (rate_flag & IEEE80211_TX_RC_USE_CTS_PROTECT) {
++	} else if (rate_flags & IEEE80211_TX_RC_USE_CTS_PROTECT) {
+ 		tx_desc->txdw4 |= cpu_to_le32(TXDESC32_CTS_SELF_ENABLE);
+ 		tx_desc->txdw4 |= cpu_to_le32(TXDESC32_HW_RTS_ENABLE);
+ 	}
+@@ -4814,16 +4829,31 @@ rtl8xxxu_fill_txdesc_v1(struct ieee80211
+  * This format is used on 8192eu/8723bu
+  */
+ void
+-rtl8xxxu_fill_txdesc_v2(struct ieee80211_hdr *hdr,
+-			struct rtl8xxxu_txdesc32 *tx_desc32, u32 rate,
+-			u16 rate_flag, bool sgi, bool short_preamble,
+-			bool ampdu_enable, u32 rts_rate)
++rtl8xxxu_fill_txdesc_v2(struct ieee80211_hw *hw, struct ieee80211_hdr *hdr,
++			struct ieee80211_tx_info *tx_info,
++			struct rtl8xxxu_txdesc32 *tx_desc32, bool sgi,
++			bool short_preamble, bool ampdu_enable, u32 rts_rate)
+ {
++	struct ieee80211_rate *tx_rate = ieee80211_get_tx_rate(hw, tx_info);
++	struct rtl8xxxu_priv *priv = hw->priv;
++	struct device *dev = &priv->udev->dev;
+ 	struct rtl8xxxu_txdesc40 *tx_desc40;
++	u32 rate;
++	u16 rate_flags = tx_info->control.rates[0].flags;
+ 	u16 seq_number;
+ 
+ 	tx_desc40 = (struct rtl8xxxu_txdesc40 *)tx_desc32;
+ 
++	if (rtl8xxxu_debug & RTL8XXXU_DEBUG_TX)
++		dev_info(dev, "%s: TX rate: %d, pkt size %d\n",
++			 __func__, rate, cpu_to_le16(tx_desc40->pkt_size));
++
++	if (rate_flags & IEEE80211_TX_RC_MCS &&
++	    !ieee80211_is_mgmt(hdr->frame_control))
++		rate = tx_info->control.rates[0].idx + DESC_RATE_MCS0;
++	else
++		rate = tx_rate->hw_value;
++
+ 	seq_number = IEEE80211_SEQ_TO_SN(le16_to_cpu(hdr->seq_ctrl));
+ 
+ 	tx_desc40->txdw4 = cpu_to_le32(rate);
+@@ -4854,10 +4884,10 @@ rtl8xxxu_fill_txdesc_v2(struct ieee80211
+ 	/*
+ 	 * rts_rate is zero if RTS/CTS or CTS to SELF are not enabled
+ 	 */
+-	if (rate_flag & IEEE80211_TX_RC_USE_RTS_CTS) {
++	if (rate_flags & IEEE80211_TX_RC_USE_RTS_CTS) {
+ 		tx_desc40->txdw3 |= cpu_to_le32(TXDESC40_RTS_CTS_ENABLE);
+ 		tx_desc40->txdw3 |= cpu_to_le32(TXDESC40_HW_RTS_ENABLE);
+-	} else if (rate_flag & IEEE80211_TX_RC_USE_CTS_PROTECT) {
++	} else if (rate_flags & IEEE80211_TX_RC_USE_CTS_PROTECT) {
+ 		/*
+ 		 * For some reason the vendor driver doesn't set
+ 		 * TXDESC40_HW_RTS_ENABLE for CTS to SELF
+@@ -4872,14 +4902,13 @@ static void rtl8xxxu_tx(struct ieee80211
+ {
+ 	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
+ 	struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
+-	struct ieee80211_rate *tx_rate = ieee80211_get_tx_rate(hw, tx_info);
+ 	struct rtl8xxxu_priv *priv = hw->priv;
+ 	struct rtl8xxxu_txdesc32 *tx_desc;
+ 	struct rtl8xxxu_tx_urb *tx_urb;
+ 	struct ieee80211_sta *sta = NULL;
+ 	struct ieee80211_vif *vif = tx_info->control.vif;
+ 	struct device *dev = &priv->udev->dev;
+-	u32 queue, rate, rts_rate;
++	u32 queue, rts_rate;
+ 	u16 pktlen = skb->len;
+ 	u16 seq_number;
+ 	u16 rate_flag = tx_info->control.rates[0].flags;
+@@ -4906,10 +4935,6 @@ static void rtl8xxxu_tx(struct ieee80211
+ 		goto error;
+ 	}
+ 
+-	if (rtl8xxxu_debug & RTL8XXXU_DEBUG_TX)
+-		dev_info(dev, "%s: TX rate: %d (%d), pkt size %d\n",
+-			 __func__, tx_rate->bitrate, tx_rate->hw_value, pktlen);
+-
+ 	if (ieee80211_is_action(hdr->frame_control))
+ 		rtl8xxxu_dump_action(dev, hdr);
+ 
+@@ -4963,12 +4988,6 @@ static void rtl8xxxu_tx(struct ieee80211
+ 		}
+ 	}
+ 
+-	if (rate_flag & IEEE80211_TX_RC_MCS &&
+-	    !ieee80211_is_mgmt(hdr->frame_control))
+-		rate = tx_info->control.rates[0].idx + DESC_RATE_MCS0;
+-	else
+-		rate = tx_rate->hw_value;
+-
+ 	if (rate_flag & IEEE80211_TX_RC_SHORT_GI ||
+ 	    (ieee80211_is_data_qos(hdr->frame_control) &&
+ 	     sta && sta->ht_cap.cap &
+@@ -4988,8 +5007,8 @@ static void rtl8xxxu_tx(struct ieee80211
+ 
+ 	seq_number = IEEE80211_SEQ_TO_SN(le16_to_cpu(hdr->seq_ctrl));
+ 
+-	priv->fops->fill_txdesc(hdr, tx_desc, rate, rate_flag, sgi,
+-				short_preamble, ampdu_enable, rts_rate);
++	priv->fops->fill_txdesc(hw, hdr, tx_info, tx_desc, sgi, short_preamble,
++				ampdu_enable, rts_rate);
+ 
+ 	rtl8xxxu_calc_tx_desc_csum(tx_desc);
+ 
diff --git a/package/kernel/mac80211/patches/657-0001-rtl8xxxu-Accept-firmware-signature-0x88e0.patch b/package/kernel/mac80211/patches/660-0001-rtl8xxxu-Accept-firmware-signature-0x88e0.patch
index ab84a53d6b..c9b2e13a94 100644
--- a/package/kernel/mac80211/patches/657-0001-rtl8xxxu-Accept-firmware-signature-0x88e0.patch
+++ b/package/kernel/mac80211/patches/660-0001-rtl8xxxu-Accept-firmware-signature-0x88e0.patch
@@ -1,4 +1,4 @@
-From 5b9c623e1e14663679d3fb6d98f222c73d072f17 Mon Sep 17 00:00:00 2001
+From f15fbdcb03abdf7403e8ebba52791cc596a8a8a6 Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Mon, 27 Jun 2016 14:08:47 -0400
 Subject: [PATCH] rtl8xxxu: Accept firmware signature 0x88e0
diff --git a/package/kernel/mac80211/patches/657-0002-rtl8xxxu-Add-initial-code-to-detect-8188eu-devices.patch b/package/kernel/mac80211/patches/660-0002-rtl8xxxu-Add-initial-code-to-detect-8188eu-devices.patch
index 9847d3eaad..ebd35fcb29 100644
--- a/package/kernel/mac80211/patches/657-0002-rtl8xxxu-Add-initial-code-to-detect-8188eu-devices.patch
+++ b/package/kernel/mac80211/patches/660-0002-rtl8xxxu-Add-initial-code-to-detect-8188eu-devices.patch
@@ -1,4 +1,4 @@
-From bde0ecd13877c4074fa59f317c201e19ac4d75cf Mon Sep 17 00:00:00 2001
+From 6f971392cd52524058f179d7c78464d692fbb018 Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Mon, 27 Jun 2016 14:23:44 -0400
 Subject: [PATCH] rtl8xxxu: Add initial code to detect 8188eu devices
@@ -24,9 +24,9 @@ Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
 +		   rtl8xxxu_8723a.o rtl8xxxu_8192c.o rtl8xxxu_8188e.o
 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
 +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
-@@ -1443,6 +1443,7 @@ void rtl8xxxu_fill_txdesc_v2(struct ieee
- 			     u16 rate_flag, bool sgi, bool short_preamble,
- 			     bool ampdu_enable);
+@@ -1446,6 +1446,7 @@ void rtl8xxxu_fill_txdesc_v2(struct ieee
+ 			     bool short_preamble, bool ampdu_enable,
+ 			     u32 rts_rate);
  
 +extern struct rtl8xxxu_fileops rtl8188eu_fops;
  extern struct rtl8xxxu_fileops rtl8192cu_fops;
@@ -110,7 +110,7 @@ Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
  MODULE_FIRMWARE("rtlwifi/rtl8192cufw_A.bin");
  MODULE_FIRMWARE("rtlwifi/rtl8192cufw_B.bin");
  MODULE_FIRMWARE("rtlwifi/rtl8192cufw_TMSC.bin");
-@@ -6159,6 +6160,8 @@ static struct usb_device_id dev_table[]
+@@ -6195,6 +6196,8 @@ static struct usb_device_id dev_table[]
  {USB_DEVICE_AND_INTERFACE_INFO(USB_VENDOR_ID_REALTEK, 0xb720, 0xff, 0xff, 0xff),
  	.driver_info = (unsigned long)&rtl8723bu_fops},
  #ifdef CPTCFG_RTL8XXXU_UNTESTED
diff --git a/package/kernel/mac80211/patches/657-0003-rtl8xxxu-Add-initial-code-to-parse-8188eu-efuse.patch b/package/kernel/mac80211/patches/660-0003-rtl8xxxu-Add-initial-code-to-parse-8188eu-efuse.patch
index c6a469d638..1905899e76 100644
--- a/package/kernel/mac80211/patches/657-0003-rtl8xxxu-Add-initial-code-to-parse-8188eu-efuse.patch
+++ b/package/kernel/mac80211/patches/660-0003-rtl8xxxu-Add-initial-code-to-parse-8188eu-efuse.patch
@@ -1,4 +1,4 @@
-From 8df8b5c2e8874fbcc0596f812be7285749fd0584 Mon Sep 17 00:00:00 2001
+From 6d5b4ef30046d74efe773613767d13d9ab95ed3d Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Mon, 27 Jun 2016 15:19:04 -0400
 Subject: [PATCH] rtl8xxxu: Add initial code to parse 8188eu efuse
diff --git a/package/kernel/mac80211/patches/657-0004-rtl8xxxu-Detect-8188eu-parts-correctly.patch b/package/kernel/mac80211/patches/660-0004-rtl8xxxu-Detect-8188eu-parts-correctly.patch
index a60125cc77..83220e88f6 100644
--- a/package/kernel/mac80211/patches/657-0004-rtl8xxxu-Detect-8188eu-parts-correctly.patch
+++ b/package/kernel/mac80211/patches/660-0004-rtl8xxxu-Detect-8188eu-parts-correctly.patch
@@ -1,4 +1,4 @@
-From 67fe7e7a468a92abf5dd3793e1d0839aa230bb36 Mon Sep 17 00:00:00 2001
+From ac5a363d61caee80e7b4464e55ab012a4450ef5d Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Mon, 27 Jun 2016 15:34:00 -0400
 Subject: [PATCH] rtl8xxxu: Detect 8188eu parts correctly
diff --git a/package/kernel/mac80211/patches/657-0005-rtl8xxxu-First-stab-at-rtl8188e_power_on.patch b/package/kernel/mac80211/patches/660-0005-rtl8xxxu-First-stab-at-rtl8188e_power_on.patch
index 9a02e68b25..dbba85b4b9 100644
--- a/package/kernel/mac80211/patches/657-0005-rtl8xxxu-First-stab-at-rtl8188e_power_on.patch
+++ b/package/kernel/mac80211/patches/660-0005-rtl8xxxu-First-stab-at-rtl8188e_power_on.patch
@@ -1,4 +1,4 @@
-From 777c1b30f8251d7c2c088a0cf600f0df513c4a0c Mon Sep 17 00:00:00 2001
+From a7c3d46915bce6d84e61e684e76564b034bdc1a9 Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Mon, 27 Jun 2016 17:08:30 -0400
 Subject: [PATCH] rtl8xxxu: First stab at rtl8188e_power_on()
diff --git a/package/kernel/mac80211/patches/657-0006-rtl8xxxu-Add-rtl8188e_disabled_to_emu.patch b/package/kernel/mac80211/patches/660-0006-rtl8xxxu-Add-rtl8188e_disabled_to_emu.patch
index e3e48804e0..066f2fe241 100644
--- a/package/kernel/mac80211/patches/657-0006-rtl8xxxu-Add-rtl8188e_disabled_to_emu.patch
+++ b/package/kernel/mac80211/patches/660-0006-rtl8xxxu-Add-rtl8188e_disabled_to_emu.patch
@@ -1,4 +1,4 @@
-From 082edba4f1650a473e6904c7bee16efc94b809ad Mon Sep 17 00:00:00 2001
+From b7335df2dc1b4c6c69ac6b95910d09a7dd5295a7 Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Wed, 29 Jun 2016 10:38:52 -0400
 Subject: [PATCH] rtl8xxxu: Add rtl8188e_disabled_to_emu()
diff --git a/package/kernel/mac80211/patches/657-0007-rtl8xxxu-8188e-Enable-scheduler.patch b/package/kernel/mac80211/patches/660-0007-rtl8xxxu-8188e-Enable-scheduler.patch
index 6912f43c1b..99f9152cac 100644
--- a/package/kernel/mac80211/patches/657-0007-rtl8xxxu-8188e-Enable-scheduler.patch
+++ b/package/kernel/mac80211/patches/660-0007-rtl8xxxu-8188e-Enable-scheduler.patch
@@ -1,4 +1,4 @@
-From e6b7225c77e0e67bd8695b24725c66f90f60bcf4 Mon Sep 17 00:00:00 2001
+From 682ffd261c494581b8fdbc81f42035a53c67f5c4 Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Wed, 29 Jun 2016 11:07:13 -0400
 Subject: [PATCH] rtl8xxxu: 8188e: Enable scheduler
diff --git a/package/kernel/mac80211/patches/657-0008-rtl8xxxu-Add-rtl8188e_usb_quirk-for-enabling-MAC-TX-.patch b/package/kernel/mac80211/patches/660-0008-rtl8xxxu-Add-rtl8188e_usb_quirk-for-enabling-MAC-TX-.patch
index c1fec44e52..fa62d6d9b1 100644
--- a/package/kernel/mac80211/patches/657-0008-rtl8xxxu-Add-rtl8188e_usb_quirk-for-enabling-MAC-TX-.patch
+++ b/package/kernel/mac80211/patches/660-0008-rtl8xxxu-Add-rtl8188e_usb_quirk-for-enabling-MAC-TX-.patch
@@ -1,4 +1,4 @@
-From e25ae461678c2f2a164e36d2cd363fea83c37be9 Mon Sep 17 00:00:00 2001
+From 58edb5e9811879e0a8e87f90057f12f615eab2d1 Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Wed, 29 Jun 2016 11:47:10 -0400
 Subject: [PATCH] rtl8xxxu: Add rtl8188e_usb_quirk() for enabling MAC TX/RX
diff --git a/package/kernel/mac80211/patches/657-0009-rtl8xxxu-8188e-add-REG_TXDMA_OFFSET_CHK-quirk.patch b/package/kernel/mac80211/patches/660-0009-rtl8xxxu-8188e-add-REG_TXDMA_OFFSET_CHK-quirk.patch
index 2fa89954cf..8a2821640c 100644
--- a/package/kernel/mac80211/patches/657-0009-rtl8xxxu-8188e-add-REG_TXDMA_OFFSET_CHK-quirk.patch
+++ b/package/kernel/mac80211/patches/660-0009-rtl8xxxu-8188e-add-REG_TXDMA_OFFSET_CHK-quirk.patch
@@ -1,4 +1,4 @@
-From 7527a39358702ca106682c36dffb1a6cb16fab53 Mon Sep 17 00:00:00 2001
+From 3ab047939db70fcae2a7c5993a8feaf3ac413e35 Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Wed, 29 Jun 2016 11:53:31 -0400
 Subject: [PATCH] rtl8xxxu: 8188e add REG_TXDMA_OFFSET_CHK quirk
diff --git a/package/kernel/mac80211/patches/657-0010-rtl8xxxu-Add-reserved-page-init-parameters-for-8188e.patch b/package/kernel/mac80211/patches/660-0010-rtl8xxxu-Add-reserved-page-init-parameters-for-8188e.patch
index d5c6d441ec..424b3b313a 100644
--- a/package/kernel/mac80211/patches/657-0010-rtl8xxxu-Add-reserved-page-init-parameters-for-8188e.patch
+++ b/package/kernel/mac80211/patches/660-0010-rtl8xxxu-Add-reserved-page-init-parameters-for-8188e.patch
@@ -1,4 +1,4 @@
-From 02b647f0bb73b2289311f471b4e1b3582591b3ed Mon Sep 17 00:00:00 2001
+From 2bfba2657e3f99c6693ea30b60af4eb1d3e3950c Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Wed, 29 Jun 2016 12:02:18 -0400
 Subject: [PATCH] rtl8xxxu: Add reserved page init parameters for 8188e
diff --git a/package/kernel/mac80211/patches/657-0011-rtl8xxxu-Correct-TX_TOTAL_PAGE_NUM-for-8188eu.patch b/package/kernel/mac80211/patches/660-0011-rtl8xxxu-Correct-TX_TOTAL_PAGE_NUM-for-8188eu.patch
index c006965fcd..5318f32ae4 100644
--- a/package/kernel/mac80211/patches/657-0011-rtl8xxxu-Correct-TX_TOTAL_PAGE_NUM-for-8188eu.patch
+++ b/package/kernel/mac80211/patches/660-0011-rtl8xxxu-Correct-TX_TOTAL_PAGE_NUM-for-8188eu.patch
@@ -1,4 +1,4 @@
-From 3b982fb9969cca0c052ab597270cba04fe469ed4 Mon Sep 17 00:00:00 2001
+From ed4c1c87b4c2653f1528c886591bbddbb68216a1 Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Mon, 8 Aug 2016 15:04:36 -0400
 Subject: [PATCH] rtl8xxxu: Correct TX_TOTAL_PAGE_NUM for 8188eu
diff --git a/package/kernel/mac80211/patches/657-0012-rtl8xxxu-Add-trxff_boundary-for-8188e.patch b/package/kernel/mac80211/patches/660-0012-rtl8xxxu-Add-trxff_boundary-for-8188e.patch
index 6866ead0b2..828799ae4a 100644
--- a/package/kernel/mac80211/patches/657-0012-rtl8xxxu-Add-trxff_boundary-for-8188e.patch
+++ b/package/kernel/mac80211/patches/660-0012-rtl8xxxu-Add-trxff_boundary-for-8188e.patch
@@ -1,4 +1,4 @@
-From 4ea8c0fae9ac694176a70fd7f87ef33dcda8f069 Mon Sep 17 00:00:00 2001
+From bc55b854b404de79353547013a8f1ae31855f7c5 Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Wed, 29 Jun 2016 12:08:31 -0400
 Subject: [PATCH] rtl8xxxu: Add trxff_boundary for 8188e
diff --git a/package/kernel/mac80211/patches/657-0013-rtl8xxxu-8188eu-specify-firmware-block-size-and-set-.patch b/package/kernel/mac80211/patches/660-0013-rtl8xxxu-8188eu-specify-firmware-block-size-and-set-.patch
index daaf4a8044..5076307a92 100644
--- a/package/kernel/mac80211/patches/657-0013-rtl8xxxu-8188eu-specify-firmware-block-size-and-set-.patch
+++ b/package/kernel/mac80211/patches/660-0013-rtl8xxxu-8188eu-specify-firmware-block-size-and-set-.patch
@@ -1,4 +1,4 @@
-From b7bc65edc18af06c2ea1e4efb539fc4e2da89650 Mon Sep 17 00:00:00 2001
+From 29311af488cc1c1790a9b53c8073442548edd4bf Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Wed, 29 Jun 2016 15:03:54 -0400
 Subject: [PATCH] rtl8xxxu: 8188eu specify firmware block size and set
diff --git a/package/kernel/mac80211/patches/657-0014-rtl8xxxu-Add-8188e-mac-init-table.patch b/package/kernel/mac80211/patches/660-0014-rtl8xxxu-Add-8188e-mac-init-table.patch
index ed9e8439d5..5360f5928f 100644
--- a/package/kernel/mac80211/patches/657-0014-rtl8xxxu-Add-8188e-mac-init-table.patch
+++ b/package/kernel/mac80211/patches/660-0014-rtl8xxxu-Add-8188e-mac-init-table.patch
@@ -1,4 +1,4 @@
-From 2f81b7920fd5812c44824e14070021d53a933ae4 Mon Sep 17 00:00:00 2001
+From 96cb7475c4c5750e8dac3dc85638f8438b9bce4e Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Tue, 19 Jul 2016 15:04:24 -0400
 Subject: [PATCH] rtl8xxxu: Add 8188e mac init table
diff --git a/package/kernel/mac80211/patches/657-0015-rtl8xxxu-Implement-rtl8188eu_init_phy_bb.patch b/package/kernel/mac80211/patches/660-0015-rtl8xxxu-Implement-rtl8188eu_init_phy_bb.patch
index e7cf045808..e7c5b7b651 100644
--- a/package/kernel/mac80211/patches/657-0015-rtl8xxxu-Implement-rtl8188eu_init_phy_bb.patch
+++ b/package/kernel/mac80211/patches/660-0015-rtl8xxxu-Implement-rtl8188eu_init_phy_bb.patch
@@ -1,4 +1,4 @@
-From da7fb3c8a1292fdc4e949e7a0342d0a6d808746e Mon Sep 17 00:00:00 2001
+From b6770f88fd208978bd84e7217fee9fedd9b3fa9f Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Tue, 19 Jul 2016 16:19:30 -0400
 Subject: [PATCH] rtl8xxxu: Implement rtl8188eu_init_phy_bb()
diff --git a/package/kernel/mac80211/patches/657-0016-rtl8xxxu-Implement-rtl8188eu_init_phy_rf.patch b/package/kernel/mac80211/patches/660-0016-rtl8xxxu-Implement-rtl8188eu_init_phy_rf.patch
index 930f37a717..89e481cdcd 100644
--- a/package/kernel/mac80211/patches/657-0016-rtl8xxxu-Implement-rtl8188eu_init_phy_rf.patch
+++ b/package/kernel/mac80211/patches/660-0016-rtl8xxxu-Implement-rtl8188eu_init_phy_rf.patch
@@ -1,4 +1,4 @@
-From 837adbdfb23b00920cc1bdce09096d1eb36061a6 Mon Sep 17 00:00:00 2001
+From 0c6fa292a9c6d7f1b870c42ed9166674463206f1 Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Tue, 19 Jul 2016 17:12:42 -0400
 Subject: [PATCH] rtl8xxxu: Implement rtl8188eu_init_phy_rf()
diff --git a/package/kernel/mac80211/patches/657-0017-rtl8xxxu-Use-auto-LLT-init-for-8188e.patch b/package/kernel/mac80211/patches/660-0017-rtl8xxxu-Use-auto-LLT-init-for-8188e.patch
index 1aad12c6de..da306deb11 100644
--- a/package/kernel/mac80211/patches/657-0017-rtl8xxxu-Use-auto-LLT-init-for-8188e.patch
+++ b/package/kernel/mac80211/patches/660-0017-rtl8xxxu-Use-auto-LLT-init-for-8188e.patch
@@ -1,4 +1,4 @@
-From 41243175fe2464b68abe300cf5e2eacf8911dbdc Mon Sep 17 00:00:00 2001
+From 86d5a5f8e59e46c51a76a303f37ad6ce9c97b73e Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Tue, 19 Jul 2016 17:27:48 -0400
 Subject: [PATCH] rtl8xxxu: Use auto LLT init for 8188e
diff --git a/package/kernel/mac80211/patches/657-0018-rtl8xxxu-Do-not-set-REG_FPGA0_TX_INFO-on-8188eu.patch b/package/kernel/mac80211/patches/660-0018-rtl8xxxu-Do-not-set-REG_FPGA0_TX_INFO-on-8188eu.patch
index edbd0b78e1..7d150eb31f 100644
--- a/package/kernel/mac80211/patches/657-0018-rtl8xxxu-Do-not-set-REG_FPGA0_TX_INFO-on-8188eu.patch
+++ b/package/kernel/mac80211/patches/660-0018-rtl8xxxu-Do-not-set-REG_FPGA0_TX_INFO-on-8188eu.patch
@@ -1,4 +1,4 @@
-From 3768a83e59924432df99e2242304899ce519e33d Mon Sep 17 00:00:00 2001
+From 519d0047f84cdd1050418bb86dd34a0c6df1206a Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Wed, 20 Jul 2016 14:32:46 -0400
 Subject: [PATCH] rtl8xxxu: Do not set REG_FPGA0_TX_INFO on 8188eu
diff --git a/package/kernel/mac80211/patches/657-0019-rtl8xxxu-Do-not-mess-with-REG_FPGA0_XA_RF_INT_OE-eit.patch b/package/kernel/mac80211/patches/660-0019-rtl8xxxu-Do-not-mess-with-REG_FPGA0_XA_RF_INT_OE-eit.patch
index 7989774890..0a3bab0524 100644
--- a/package/kernel/mac80211/patches/657-0019-rtl8xxxu-Do-not-mess-with-REG_FPGA0_XA_RF_INT_OE-eit.patch
+++ b/package/kernel/mac80211/patches/660-0019-rtl8xxxu-Do-not-mess-with-REG_FPGA0_XA_RF_INT_OE-eit.patch
@@ -1,4 +1,4 @@
-From 9a2ac8b4f023be5ebd8015979ac5da9b3a564554 Mon Sep 17 00:00:00 2001
+From a4234121f383eed37e0a5ea8aed56bb75027305c Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Wed, 20 Jul 2016 14:38:23 -0400
 Subject: [PATCH] rtl8xxxu: Do not mess with REG_FPGA0_XA_RF_INT_OE either on
diff --git a/package/kernel/mac80211/patches/657-0020-rtl8xxxu-Set-transfer-page-size-for-8188eu.patch b/package/kernel/mac80211/patches/660-0020-rtl8xxxu-Set-transfer-page-size-for-8188eu.patch
index dd9ea46ae1..595d1430ff 100644
--- a/package/kernel/mac80211/patches/657-0020-rtl8xxxu-Set-transfer-page-size-for-8188eu.patch
+++ b/package/kernel/mac80211/patches/660-0020-rtl8xxxu-Set-transfer-page-size-for-8188eu.patch
@@ -1,4 +1,4 @@
-From 68fe82f572c99dff53cff78e7fac33212988fa08 Mon Sep 17 00:00:00 2001
+From 497b244578992c6353d214140f026154e4f4f710 Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Wed, 20 Jul 2016 15:59:31 -0400
 Subject: [PATCH] rtl8xxxu: Set transfer page size for 8188eu
diff --git a/package/kernel/mac80211/patches/657-0021-rtl8xxxu-Enable-TX-report-timer-on-8188eu.patch b/package/kernel/mac80211/patches/660-0021-rtl8xxxu-Enable-TX-report-timer-on-8188eu.patch
index b2a05d52e7..c1bc3fa683 100644
--- a/package/kernel/mac80211/patches/657-0021-rtl8xxxu-Enable-TX-report-timer-on-8188eu.patch
+++ b/package/kernel/mac80211/patches/660-0021-rtl8xxxu-Enable-TX-report-timer-on-8188eu.patch
@@ -1,4 +1,4 @@
-From 763c44f30e435083c206c86bfdcb5f31d8683d77 Mon Sep 17 00:00:00 2001
+From a57a3fbb1a22544ce96e4dbe423694e982d54700 Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Wed, 20 Jul 2016 16:13:06 -0400
 Subject: [PATCH] rtl8xxxu: Enable TX report timer on 8188eu
diff --git a/package/kernel/mac80211/patches/657-0022-rtl8xxxu-Setup-interrupts-for-8188eu.patch b/package/kernel/mac80211/patches/660-0022-rtl8xxxu-Setup-interrupts-for-8188eu.patch
index 0ca13b1281..774b2a2bdd 100644
--- a/package/kernel/mac80211/patches/657-0022-rtl8xxxu-Setup-interrupts-for-8188eu.patch
+++ b/package/kernel/mac80211/patches/660-0022-rtl8xxxu-Setup-interrupts-for-8188eu.patch
@@ -1,4 +1,4 @@
-From 27b7eb2bb2796739d47911ad0bb97c8cf3dd2aa6 Mon Sep 17 00:00:00 2001
+From 4c85a1704e555aa04d72e31a4a90b9c4bf01d83b Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Wed, 20 Jul 2016 16:59:18 -0400
 Subject: [PATCH] rtl8xxxu: Setup interrupts for 8188eu
diff --git a/package/kernel/mac80211/patches/657-0023-rtl8xxxu-Use-rxdesc16-and-32-byte-tx-descriptors-for.patch b/package/kernel/mac80211/patches/660-0023-rtl8xxxu-Use-rxdesc16-and-32-byte-tx-descriptors-for.patch
index 5dc7c4f641..c46522ecbb 100644
--- a/package/kernel/mac80211/patches/657-0023-rtl8xxxu-Use-rxdesc16-and-32-byte-tx-descriptors-for.patch
+++ b/package/kernel/mac80211/patches/660-0023-rtl8xxxu-Use-rxdesc16-and-32-byte-tx-descriptors-for.patch
@@ -1,4 +1,4 @@
-From 8cb09680de2801b737aca93dad9f2c0095beba49 Mon Sep 17 00:00:00 2001
+From 444b8212457b611f482ee6a5f52e8a14e6881f6e Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Thu, 21 Jul 2016 14:52:49 -0400
 Subject: [PATCH] rtl8xxxu: Use rxdesc16 and 32 byte tx descriptors for 8188eu
diff --git a/package/kernel/mac80211/patches/657-0024-rtl8xxxu-8188eu-use-same-ADDA-on-parameters-as-8723a.patch b/package/kernel/mac80211/patches/660-0024-rtl8xxxu-8188eu-use-same-ADDA-on-parameters-as-8723a.patch
index b5864e5728..3177ee35fc 100644
--- a/package/kernel/mac80211/patches/657-0024-rtl8xxxu-8188eu-use-same-ADDA-on-parameters-as-8723a.patch
+++ b/package/kernel/mac80211/patches/660-0024-rtl8xxxu-8188eu-use-same-ADDA-on-parameters-as-8723a.patch
@@ -1,4 +1,4 @@
-From ce56712d34130c0d0fdbd9e2007f7db1b5a35b1f Mon Sep 17 00:00:00 2001
+From 399409ff2196eb6d3f758579b63a1091fff93870 Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Thu, 21 Jul 2016 15:23:16 -0400
 Subject: [PATCH] rtl8xxxu: 8188eu use same ADDA on parameters as 8723au/8192cu
diff --git a/package/kernel/mac80211/patches/657-0025-rtl8xxxu-Add-PHY-IQ-calibration-code-for-8188eu.patch b/package/kernel/mac80211/patches/660-0025-rtl8xxxu-Add-PHY-IQ-calibration-code-for-8188eu.patch
index a6a193f31f..ce76a67d9e 100644
--- a/package/kernel/mac80211/patches/657-0025-rtl8xxxu-Add-PHY-IQ-calibration-code-for-8188eu.patch
+++ b/package/kernel/mac80211/patches/660-0025-rtl8xxxu-Add-PHY-IQ-calibration-code-for-8188eu.patch
@@ -1,4 +1,4 @@
-From 3ee0271b64db3cc81a089ec726b600c40ee03f45 Mon Sep 17 00:00:00 2001
+From 9a3c53da5228607375ab69d6e3cbc375f18a4f82 Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Thu, 21 Jul 2016 17:25:56 -0400
 Subject: [PATCH] rtl8xxxu: Add PHY IQ calibration code for 8188eu
diff --git a/package/kernel/mac80211/patches/657-0026-rtl8xxxu-8188eu-uses-the-gen2-thermal-meter.patch b/package/kernel/mac80211/patches/660-0026-rtl8xxxu-8188eu-uses-the-gen2-thermal-meter.patch
index ded83024b2..81b1d848a3 100644
--- a/package/kernel/mac80211/patches/657-0026-rtl8xxxu-8188eu-uses-the-gen2-thermal-meter.patch
+++ b/package/kernel/mac80211/patches/660-0026-rtl8xxxu-8188eu-uses-the-gen2-thermal-meter.patch
@@ -1,4 +1,4 @@
-From 3c8d7c293ae58171122e426467491a9abb3c8475 Mon Sep 17 00:00:00 2001
+From e33fed77d7493ef16c3afd32eb0d7c99fc95bfad Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Fri, 22 Jul 2016 11:20:00 -0400
 Subject: [PATCH] rtl8xxxu: 8188eu uses the gen2 thermal meter
diff --git a/package/kernel/mac80211/patches/657-0027-rtl8xxxu-Set-REG_USB_HRPWM-to-0-for-8188eu.patch b/package/kernel/mac80211/patches/660-0027-rtl8xxxu-Set-REG_USB_HRPWM-to-0-for-8188eu.patch
index e4978efd36..4c242453b8 100644
--- a/package/kernel/mac80211/patches/657-0027-rtl8xxxu-Set-REG_USB_HRPWM-to-0-for-8188eu.patch
+++ b/package/kernel/mac80211/patches/660-0027-rtl8xxxu-Set-REG_USB_HRPWM-to-0-for-8188eu.patch
@@ -1,4 +1,4 @@
-From c146fd29e0c941ba9bfbd718249eac7fad387844 Mon Sep 17 00:00:00 2001
+From 42808faad1b2cf0366a39074c08dbd181fa51b07 Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Fri, 22 Jul 2016 11:33:29 -0400
 Subject: [PATCH] rtl8xxxu: Set REG_USB_HRPWM to 0 for 8188eu
diff --git a/package/kernel/mac80211/patches/657-0028-rtl8xxxu-Implement-rtl8188eu_config_channel.patch b/package/kernel/mac80211/patches/660-0028-rtl8xxxu-Implement-rtl8188eu_config_channel.patch
index ac967ed164..a397125e8c 100644
--- a/package/kernel/mac80211/patches/657-0028-rtl8xxxu-Implement-rtl8188eu_config_channel.patch
+++ b/package/kernel/mac80211/patches/660-0028-rtl8xxxu-Implement-rtl8188eu_config_channel.patch
@@ -1,4 +1,4 @@
-From 945359dd08b6d03c48f08094d3bd270fbe917114 Mon Sep 17 00:00:00 2001
+From 9796f3807764567ecde6e3787a66e4b4edbc35df Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Fri, 22 Jul 2016 11:40:13 -0400
 Subject: [PATCH] rtl8xxxu: Implement rtl8188eu_config_channel()
diff --git a/package/kernel/mac80211/patches/657-0029-rtl8xxxu-Use-gen2-H2C-commands-for-8188eu.patch b/package/kernel/mac80211/patches/660-0029-rtl8xxxu-Use-gen2-H2C-commands-for-8188eu.patch
index 519bc1c592..cf3cde70b0 100644
--- a/package/kernel/mac80211/patches/657-0029-rtl8xxxu-Use-gen2-H2C-commands-for-8188eu.patch
+++ b/package/kernel/mac80211/patches/660-0029-rtl8xxxu-Use-gen2-H2C-commands-for-8188eu.patch
@@ -1,4 +1,4 @@
-From 58bd58324aa2ba7091b0684f809c3da89507d5e8 Mon Sep 17 00:00:00 2001
+From 4ec1cada65cc1876277f5325b78019667f6e18c4 Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Fri, 22 Jul 2016 11:44:12 -0400
 Subject: [PATCH] rtl8xxxu: Use gen2 H2C commands for 8188eu
diff --git a/package/kernel/mac80211/patches/657-0030-rtl8xxxu-Initialize-GPIO-settings-for-8188eu.patch b/package/kernel/mac80211/patches/660-0030-rtl8xxxu-Initialize-GPIO-settings-for-8188eu.patch
index 33f8602cfe..2a5bb00b40 100644
--- a/package/kernel/mac80211/patches/657-0030-rtl8xxxu-Initialize-GPIO-settings-for-8188eu.patch
+++ b/package/kernel/mac80211/patches/660-0030-rtl8xxxu-Initialize-GPIO-settings-for-8188eu.patch
@@ -1,4 +1,4 @@
-From b550ef4873a9828b8093db996456b98c017a31fc Mon Sep 17 00:00:00 2001
+From 061838d68d2c20acb5a57fbd92e3ed0ae906142e Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Fri, 22 Jul 2016 12:56:30 -0400
 Subject: [PATCH] rtl8xxxu: Initialize GPIO settings for 8188eu
diff --git a/package/kernel/mac80211/patches/657-0031-rtl8xxxu-Add-simple-rtl8188eu_rf_on-routine.patch b/package/kernel/mac80211/patches/660-0031-rtl8xxxu-Add-simple-rtl8188eu_rf_on-routine.patch
index f275ff51ba..2803b9747a 100644
--- a/package/kernel/mac80211/patches/657-0031-rtl8xxxu-Add-simple-rtl8188eu_rf_on-routine.patch
+++ b/package/kernel/mac80211/patches/660-0031-rtl8xxxu-Add-simple-rtl8188eu_rf_on-routine.patch
@@ -1,4 +1,4 @@
-From 8697958f7b3a8e6402e6dfb3facc067fb3423a88 Mon Sep 17 00:00:00 2001
+From 2024562ed45d905bee00aea923c218c493c09d27 Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Fri, 22 Jul 2016 13:10:02 -0400
 Subject: [PATCH] rtl8xxxu: Add simple rtl8188eu_rf_on() routine
diff --git a/package/kernel/mac80211/patches/657-0032-rtl8xxxu-Implement-rtl8188e_disable_rf.patch b/package/kernel/mac80211/patches/660-0032-rtl8xxxu-Implement-rtl8188e_disable_rf.patch
index 3990524a37..1778b1636b 100644
--- a/package/kernel/mac80211/patches/657-0032-rtl8xxxu-Implement-rtl8188e_disable_rf.patch
+++ b/package/kernel/mac80211/patches/660-0032-rtl8xxxu-Implement-rtl8188e_disable_rf.patch
@@ -1,4 +1,4 @@
-From c59fee32cbdda0382b6c37429d8bb50bafe9d166 Mon Sep 17 00:00:00 2001
+From f26f81e233f7a9b1bf21aa0de16a8db733c317ec Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Fri, 22 Jul 2016 13:17:36 -0400
 Subject: [PATCH] rtl8xxxu: Implement rtl8188e_disable_rf()
diff --git a/package/kernel/mac80211/patches/657-0033-rtl8xxxu-Update-8188e-efuse-definition-for-power-val.patch b/package/kernel/mac80211/patches/660-0033-rtl8xxxu-Update-8188e-efuse-definition-for-power-val.patch
index 1f8d24c2ec..c6d3d62351 100644
--- a/package/kernel/mac80211/patches/657-0033-rtl8xxxu-Update-8188e-efuse-definition-for-power-val.patch
+++ b/package/kernel/mac80211/patches/660-0033-rtl8xxxu-Update-8188e-efuse-definition-for-power-val.patch
@@ -1,4 +1,4 @@
-From 4d303a7ecabc54e02484e903969517072a4ca3b4 Mon Sep 17 00:00:00 2001
+From 9067e08ea9ba380340388c3ad4ab85bd54ff4e8d Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Fri, 22 Jul 2016 16:46:11 -0400
 Subject: [PATCH] rtl8xxxu: Update 8188e efuse definition for power values
diff --git a/package/kernel/mac80211/patches/657-0034-rtl8xxxu-Implement-rtl8188e_set_tx_power.patch b/package/kernel/mac80211/patches/660-0034-rtl8xxxu-Implement-rtl8188e_set_tx_power.patch
index 3d64e495bc..7cc0c1b76b 100644
--- a/package/kernel/mac80211/patches/657-0034-rtl8xxxu-Implement-rtl8188e_set_tx_power.patch
+++ b/package/kernel/mac80211/patches/660-0034-rtl8xxxu-Implement-rtl8188e_set_tx_power.patch
@@ -1,4 +1,4 @@
-From 1b92f72f2880049ea322f89680bf5ebea7a0cf05 Mon Sep 17 00:00:00 2001
+From cd4a93d1532b2f0ffe508f7fb5d464ec49634dcd Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Fri, 22 Jul 2016 13:55:24 -0400
 Subject: [PATCH] rtl8xxxu: Implement rtl8188e_set_tx_power()
diff --git a/package/kernel/mac80211/patches/657-0035-rtl8xxxu-Implement-rtl8xxxu_fill_txdesc_v3-for-8188e.patch b/package/kernel/mac80211/patches/660-0035-rtl8xxxu-Implement-rtl8xxxu_fill_txdesc_v3-for-8188e.patch
index 1d3e5732b1..8ad4c70109 100644
--- a/package/kernel/mac80211/patches/657-0035-rtl8xxxu-Implement-rtl8xxxu_fill_txdesc_v3-for-8188e.patch
+++ b/package/kernel/mac80211/patches/660-0035-rtl8xxxu-Implement-rtl8xxxu_fill_txdesc_v3-for-8188e.patch
@@ -1,4 +1,4 @@
-From efbb5e6fb69239791deaeec71c7b92998658fe89 Mon Sep 17 00:00:00 2001
+From 3c50918b180d091a49e412742a4f7aa1a89802b1 Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Tue, 26 Jul 2016 14:01:14 -0400
 Subject: [PATCH] rtl8xxxu: Implement rtl8xxxu_fill_txdesc_v3() for 8188eu
@@ -7,10 +7,10 @@ Getting closer but still no cigar.
 
 Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
 ---
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h   | 10 ++++
+ drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h   | 11 +++
  .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c |  1 +
- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c  | 62 ++++++++++++++++++++++
- 3 files changed, 73 insertions(+)
+ .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c  | 78 ++++++++++++++++++++++
+ 3 files changed, 90 insertions(+)
 
 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
 +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
@@ -34,17 +34,18 @@ Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
  
  /* Word 8 */
  #define TXDESC40_HW_SEQ_ENABLE		BIT(15)
-@@ -1485,6 +1491,10 @@ void rtl8xxxu_fill_txdesc_v2(struct ieee
- 			     struct rtl8xxxu_txdesc32 *tx_desc32, u32 rate,
- 			     u16 rate_flag, bool sgi, bool short_preamble,
- 			     bool ampdu_enable);
-+void rtl8xxxu_fill_txdesc_v3(struct ieee80211_hdr *hdr,
-+			     struct rtl8xxxu_txdesc32 *tx_desc32, u32 rate,
-+			     u16 rate_flag, bool sgi, bool short_preamble,
-+			     bool ampdu_enable);
+@@ -1487,6 +1493,11 @@ void rtl8xxxu_fill_txdesc_v2(struct ieee
+ 			     struct ieee80211_tx_info *tx_info,
+ 			     struct rtl8xxxu_txdesc32 *tx_desc32, bool sgi,
+ 			     bool short_preamble, bool ampdu_enable,
++			     u32 rts_rate);
++void rtl8xxxu_fill_txdesc_v3(struct ieee80211_hw *hw, struct ieee80211_hdr *hdr,
++			     struct ieee80211_tx_info *tx_info,
++			     struct rtl8xxxu_txdesc32 *tx_desc32, bool sgi,
++			     bool short_preamble, bool ampdu_enable,
+ 			     u32 rts_rate);
  
  extern struct rtl8xxxu_fileops rtl8188eu_fops;
- extern struct rtl8xxxu_fileops rtl8192cu_fops;
 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
 +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
 @@ -1217,6 +1217,7 @@ struct rtl8xxxu_fileops rtl8188eu_fops =
@@ -57,7 +58,7 @@ Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
  	.tx_desc_size = sizeof(struct rtl8xxxu_txdesc32),
 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
 +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
-@@ -4888,6 +4888,68 @@ rtl8xxxu_fill_txdesc_v2(struct ieee80211
+@@ -4923,6 +4923,84 @@ rtl8xxxu_fill_txdesc_v2(struct ieee80211
  	}
  }
  
@@ -67,13 +68,28 @@ Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
 + * on 8188eu devices so far.
 + */
 +void
-+rtl8xxxu_fill_txdesc_v3(struct ieee80211_hdr *hdr,
-+			struct rtl8xxxu_txdesc32 *tx_desc, u32 rate,
-+			u16 rate_flag, bool sgi, bool short_preamble,
-+			bool ampdu_enable)
++rtl8xxxu_fill_txdesc_v3(struct ieee80211_hw *hw, struct ieee80211_hdr *hdr,
++			struct ieee80211_tx_info *tx_info,
++			struct rtl8xxxu_txdesc32 *tx_desc, bool sgi,
++			bool short_preamble, bool ampdu_enable, u32 rts_rate)
 +{
++	struct ieee80211_rate *tx_rate = ieee80211_get_tx_rate(hw, tx_info);
++	struct rtl8xxxu_priv *priv = hw->priv;
++	struct device *dev = &priv->udev->dev;
++	u32 rate;
++	u16 rate_flags = tx_info->control.rates[0].flags;
 +	u16 seq_number;
 +
++	if (rate_flags & IEEE80211_TX_RC_MCS &&
++	    !ieee80211_is_mgmt(hdr->frame_control))
++		rate = tx_info->control.rates[0].idx + DESC_RATE_MCS0;
++	else
++		rate = tx_rate->hw_value;
++
++	if (rtl8xxxu_debug & RTL8XXXU_DEBUG_TX)
++		dev_info(dev, "%s: TX rate: %d, pkt size %d\n",
++			 __func__, rate, cpu_to_le16(tx_desc->pkt_size));
++
 +	seq_number = IEEE80211_SEQ_TO_SN(le16_to_cpu(hdr->seq_ctrl));
 +
 +	tx_desc->txdw5 = cpu_to_le32(rate);
@@ -107,15 +123,16 @@ Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
 +	if (sgi)
 +		tx_desc->txdw5 |= cpu_to_le32(TXDESC32_SHORT_GI);
 +
-+	if (rate_flag & IEEE80211_TX_RC_USE_RTS_CTS) {
-+		/*
-+		 * Use RTS rate 24M - does the mac80211 tell
-+		 * us which to use?
-+		 */
-+		tx_desc->txdw4 |= cpu_to_le32(DESC_RATE_24M <<
-+					      TXDESC32_RTS_RATE_SHIFT);
++	/*
++	 * rts_rate is zero if RTS/CTS or CTS to SELF are not enabled
++	 */
++	tx_desc->txdw4 |= cpu_to_le32(rts_rate << TXDESC32_RTS_RATE_SHIFT);
++	if (rate_flags & IEEE80211_TX_RC_USE_RTS_CTS) {
 +		tx_desc->txdw4 |= cpu_to_le32(TXDESC32_RTS_CTS_ENABLE);
 +		tx_desc->txdw4 |= cpu_to_le32(TXDESC32_HW_RTS_ENABLE);
++	} else if (rate_flags & IEEE80211_TX_RC_USE_CTS_PROTECT) {
++		tx_desc->txdw4 |= cpu_to_le32(TXDESC32_CTS_SELF_ENABLE);
++		tx_desc->txdw4 |= cpu_to_le32(TXDESC32_HW_RTS_ENABLE);
 +	}
 +
 +	tx_desc->txdw2 |= cpu_to_le32(TXDESC_ANTENNA_SELECT_A |
diff --git a/package/kernel/mac80211/patches/657-0036-rtl8xxxu-Add-some-8188eu-registers-and-update-CCK0_A.patch b/package/kernel/mac80211/patches/660-0036-rtl8xxxu-Add-some-8188eu-registers-and-update-CCK0_A.patch
index ab431c2ddf..e7f97a5b9d 100644
--- a/package/kernel/mac80211/patches/657-0036-rtl8xxxu-Add-some-8188eu-registers-and-update-CCK0_A.patch
+++ b/package/kernel/mac80211/patches/660-0036-rtl8xxxu-Add-some-8188eu-registers-and-update-CCK0_A.patch
@@ -1,4 +1,4 @@
-From 68c6f01e38171a4b8c4488610058dd5ded924b93 Mon Sep 17 00:00:00 2001
+From a9f5a167be625cf0cd157aa38f3635b2b1f0cc0f Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Fri, 29 Jul 2016 15:25:34 -0400
 Subject: [PATCH] rtl8xxxu: Add some 8188eu registers and update
diff --git a/package/kernel/mac80211/patches/657-0037-rtl8xxxu-Improve-register-description-for-REG_FPGA1_.patch b/package/kernel/mac80211/patches/660-0037-rtl8xxxu-Improve-register-description-for-REG_FPGA1_.patch
index 36345fcf00..bb940db3c8 100644
--- a/package/kernel/mac80211/patches/657-0037-rtl8xxxu-Improve-register-description-for-REG_FPGA1_.patch
+++ b/package/kernel/mac80211/patches/660-0037-rtl8xxxu-Improve-register-description-for-REG_FPGA1_.patch
@@ -1,4 +1,4 @@
-From ea2e7a5963f04802d1df3c882e2db30e5e98e434 Mon Sep 17 00:00:00 2001
+From 5731f8a7485120836c42e0dfae61644588ffd119 Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Fri, 29 Jul 2016 15:57:19 -0400
 Subject: [PATCH] rtl8xxxu: Improve register description for REG_FPGA1_TX_INFO
diff --git a/package/kernel/mac80211/patches/657-0038-rtl8xxxu-properly-detect-RTL8188EU-devices.patch b/package/kernel/mac80211/patches/660-0038-rtl8xxxu-properly-detect-RTL8188EU-devices.patch
index 57dc27dbab..ed3a27be40 100644
--- a/package/kernel/mac80211/patches/657-0038-rtl8xxxu-properly-detect-RTL8188EU-devices.patch
+++ b/package/kernel/mac80211/patches/660-0038-rtl8xxxu-properly-detect-RTL8188EU-devices.patch
@@ -1,4 +1,4 @@
-From f7813794db87b042c3ebcf7d767b865f58972ff1 Mon Sep 17 00:00:00 2001
+From 36c071e30dc5759be3e53ac93459c24fb64d41c3 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
 Date: Fri, 29 Jul 2016 18:22:37 +0200
 Subject: [PATCH] rtl8xxxu: properly detect RTL8188EU devices
diff --git a/package/kernel/mac80211/patches/657-0039-rtl8xxxu-Implement-8188eu-specific-8051-reset-functi.patch b/package/kernel/mac80211/patches/660-0039-rtl8xxxu-Implement-8188eu-specific-8051-reset-functi.patch
index 1e2a89a039..65bab0deee 100644
--- a/package/kernel/mac80211/patches/657-0039-rtl8xxxu-Implement-8188eu-specific-8051-reset-functi.patch
+++ b/package/kernel/mac80211/patches/660-0039-rtl8xxxu-Implement-8188eu-specific-8051-reset-functi.patch
@@ -1,4 +1,4 @@
-From 7ebc1e51f92b632774131291f471c66554179a18 Mon Sep 17 00:00:00 2001
+From 660a287a0a32ce9f8be9b3ad625c597ad1ed38a2 Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Wed, 10 Aug 2016 15:40:30 -0400
 Subject: [PATCH] rtl8xxxu: Implement 8188eu specific 8051 reset function
diff --git a/package/kernel/mac80211/patches/657-0040-rtl8xxxu-Disable-packet-DMA-aggregation-on-8188eu.patch b/package/kernel/mac80211/patches/660-0040-rtl8xxxu-Disable-packet-DMA-aggregation-on-8188eu.patch
index abd63bb6c9..ada4f2df52 100644
--- a/package/kernel/mac80211/patches/657-0040-rtl8xxxu-Disable-packet-DMA-aggregation-on-8188eu.patch
+++ b/package/kernel/mac80211/patches/660-0040-rtl8xxxu-Disable-packet-DMA-aggregation-on-8188eu.patch
@@ -1,4 +1,4 @@
-From bfc96547cef1573569be623ea163386fc6830bde Mon Sep 17 00:00:00 2001
+From f435337a2fc97c97476d833700e4a8fd17d99007 Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Wed, 10 Aug 2016 15:41:13 -0400
 Subject: [PATCH] rtl8xxxu: Disable packet DMA aggregation on 8188eu
diff --git a/package/kernel/mac80211/patches/657-0041-rtl8xxxu-8188eu-set-REG_OFDM0_XA_AGC_CORE1-to-match-.patch b/package/kernel/mac80211/patches/660-0041-rtl8xxxu-8188eu-set-REG_OFDM0_XA_AGC_CORE1-to-match-.patch
index 38631b947d..0370693e46 100644
--- a/package/kernel/mac80211/patches/657-0041-rtl8xxxu-8188eu-set-REG_OFDM0_XA_AGC_CORE1-to-match-.patch
+++ b/package/kernel/mac80211/patches/660-0041-rtl8xxxu-8188eu-set-REG_OFDM0_XA_AGC_CORE1-to-match-.patch
@@ -1,4 +1,4 @@
-From 401d45458f0125bd787cbd0a356a610c0624886c Mon Sep 17 00:00:00 2001
+From 4aecb21cdc491804c936a71e98192ba144757ea3 Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Wed, 10 Aug 2016 16:06:37 -0400
 Subject: [PATCH] rtl8xxxu: 8188eu set REG_OFDM0_XA_AGC_CORE1 to match vendor
@@ -14,7 +14,7 @@ Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
 
 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
 +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
-@@ -5885,7 +5885,10 @@ exit:
+@@ -5937,7 +5937,10 @@ exit:
  	rtl8xxxu_write16(priv, REG_RXFLTMAP2, 0xffff);
  	rtl8xxxu_write16(priv, REG_RXFLTMAP0, 0xffff);
  
diff --git a/package/kernel/mac80211/patches/657-0042-rtl8xxxu-Fix-rtl8188eu-connection-fail.patch b/package/kernel/mac80211/patches/660-0042-rtl8xxxu-Fix-rtl8188eu-connection-fail.patch
index 584b4ba9d2..1a39cc461a 100644
--- a/package/kernel/mac80211/patches/657-0042-rtl8xxxu-Fix-rtl8188eu-connection-fail.patch
+++ b/package/kernel/mac80211/patches/660-0042-rtl8xxxu-Fix-rtl8188eu-connection-fail.patch
@@ -1,4 +1,4 @@
-From 5b57ad0d9aed6570c7ef1dce306dabb28cc4e03b Mon Sep 17 00:00:00 2001
+From ef6a147ea381e76fa02358aa5b65816121d57a4c Mon Sep 17 00:00:00 2001
 From: Taehee Yoo <ap420073@gmail.com>
 Date: Sun, 21 Aug 2016 20:38:22 +0900
 Subject: [PATCH] rtl8xxxu: Fix rtl8188eu connection fail
diff --git a/package/kernel/mac80211/patches/657-0043-rtl8xxxu-Do-not-set-auto-rate-fallback-on-8188eu.patch b/package/kernel/mac80211/patches/660-0043-rtl8xxxu-Do-not-set-auto-rate-fallback-on-8188eu.patch
index 0039f993ea..c69de5b0a7 100644
--- a/package/kernel/mac80211/patches/657-0043-rtl8xxxu-Do-not-set-auto-rate-fallback-on-8188eu.patch
+++ b/package/kernel/mac80211/patches/660-0043-rtl8xxxu-Do-not-set-auto-rate-fallback-on-8188eu.patch
@@ -1,4 +1,4 @@
-From 4147460f9da0764139cf09a5c662b6603145bcfa Mon Sep 17 00:00:00 2001
+From 738832d9e91098f5b3ddb4e71fe8e666575c6bdb Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Wed, 24 Aug 2016 13:54:00 -0400
 Subject: [PATCH] rtl8xxxu: Do not set auto rate fallback on 8188eu
@@ -19,7 +19,7 @@ Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
 
 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
 +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
-@@ -1397,6 +1397,7 @@ struct rtl8xxxu_fileops {
+@@ -1398,6 +1398,7 @@ struct rtl8xxxu_fileops {
  	u8 has_s0s1:1;
  	u8 has_tx_report:1;
  	u8 gen2_thermal_meter:1;
@@ -39,7 +39,7 @@ Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
  	.adda_2t_path_on_a = 0x04db25a4,
 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c
 +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c
-@@ -1649,6 +1649,7 @@ struct rtl8xxxu_fileops rtl8192eu_fops =
+@@ -1655,6 +1655,7 @@ struct rtl8xxxu_fileops rtl8192eu_fops =
  	.rx_desc_size = sizeof(struct rtl8xxxu_rxdesc24),
  	.has_s0s1 = 0,
  	.gen2_thermal_meter = 1,
@@ -59,7 +59,7 @@ Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
  	.adda_2t_path_on_a = 0x04db25a4,
 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c
 +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c
-@@ -1669,6 +1669,7 @@ struct rtl8xxxu_fileops rtl8723bu_fops =
+@@ -1673,6 +1673,7 @@ struct rtl8xxxu_fileops rtl8723bu_fops =
  	.has_s0s1 = 1,
  	.has_tx_report = 1,
  	.gen2_thermal_meter = 1,
diff --git a/package/kernel/mac80211/patches/657-0044-rtl8xxxu-Enable-8188eu-driver.patch b/package/kernel/mac80211/patches/660-0044-rtl8xxxu-Enable-8188eu-driver.patch
index 051ac5b552..49aba984b5 100644
--- a/package/kernel/mac80211/patches/657-0044-rtl8xxxu-Enable-8188eu-driver.patch
+++ b/package/kernel/mac80211/patches/660-0044-rtl8xxxu-Enable-8188eu-driver.patch
@@ -1,4 +1,4 @@
-From 24122ccad4d3f063554966890342ea6602bce92b Mon Sep 17 00:00:00 2001
+From b7aed472c6639e2a523d0ef90dba61246d7bd9b4 Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Mon, 25 Jul 2016 12:32:02 -0400
 Subject: [PATCH] rtl8xxxu: Enable 8188eu driver
diff --git a/package/kernel/mac80211/patches/657-0045-rtl8xxxu-Add-rtl8188etv-to-USB-device-list.patch b/package/kernel/mac80211/patches/660-0045-rtl8xxxu-Add-rtl8188etv-to-USB-device-list.patch
index 0941502c28..6bc507797c 100644
--- a/package/kernel/mac80211/patches/657-0045-rtl8xxxu-Add-rtl8188etv-to-USB-device-list.patch
+++ b/package/kernel/mac80211/patches/660-0045-rtl8xxxu-Add-rtl8188etv-to-USB-device-list.patch
@@ -1,4 +1,4 @@
-From 5e95bd4b9f8744e752ec5e76fa6abbb316b99230 Mon Sep 17 00:00:00 2001
+From 13d8b1bb62307242615f1bebd67d165a91b9f7d5 Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Fri, 26 Aug 2016 10:28:45 -0400
 Subject: [PATCH] rtl8xxxu: Add rtl8188etv to USB device list
@@ -13,7 +13,7 @@ Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
 
 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
 +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
-@@ -6257,6 +6257,9 @@ static struct usb_device_id dev_table[]
+@@ -6309,6 +6309,9 @@ static struct usb_device_id dev_table[]
  #ifdef CPTCFG_RTL8XXXU_UNTESTED
  {USB_DEVICE_AND_INTERFACE_INFO(USB_VENDOR_ID_REALTEK, 0x8179, 0xff, 0xff, 0xff),
  	.driver_info = (unsigned long)&rtl8188eu_fops},
diff --git a/package/kernel/mac80211/patches/657-0046-rtl8xxxu-Add-sitecom-dongle-to-USB-device-list.patch b/package/kernel/mac80211/patches/660-0046-rtl8xxxu-Add-sitecom-dongle-to-USB-device-list.patch
index 3259efcba5..3797206359 100644
--- a/package/kernel/mac80211/patches/657-0046-rtl8xxxu-Add-sitecom-dongle-to-USB-device-list.patch
+++ b/package/kernel/mac80211/patches/660-0046-rtl8xxxu-Add-sitecom-dongle-to-USB-device-list.patch
@@ -1,4 +1,4 @@
-From b95138b153f49f9b76b0a393e21c508d8a8ea751 Mon Sep 17 00:00:00 2001
+From e7be61a187c902ae296acf70981a899e9e34a885 Mon Sep 17 00:00:00 2001
 From: Andrea Merello <andrea.merello@gmail.com>
 Date: Fri, 26 Aug 2016 19:18:17 +0200
 Subject: [PATCH] rtl8xxxu: Add sitecom dongle to USB device list
@@ -11,7 +11,7 @@ Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
 
 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
 +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
-@@ -6260,6 +6260,9 @@ static struct usb_device_id dev_table[]
+@@ -6312,6 +6312,9 @@ static struct usb_device_id dev_table[]
  /* Tested by Hans de Goede - rtl8188etv */
  {USB_DEVICE_AND_INTERFACE_INFO(USB_VENDOR_ID_REALTEK, 0x0179, 0xff, 0xff, 0xff),
  	.driver_info = (unsigned long)&rtl8188eu_fops},
diff --git a/package/kernel/mac80211/patches/657-0047-rtl8xxxu-Implement-rtl8188eu_active_to_emu.patch b/package/kernel/mac80211/patches/660-0047-rtl8xxxu-Implement-rtl8188eu_active_to_emu.patch
index 4c11f02450..853f2f9ec4 100644
--- a/package/kernel/mac80211/patches/657-0047-rtl8xxxu-Implement-rtl8188eu_active_to_emu.patch
+++ b/package/kernel/mac80211/patches/660-0047-rtl8xxxu-Implement-rtl8188eu_active_to_emu.patch
@@ -1,4 +1,4 @@
-From e36a438e6ae82a4426c06babb48bc3c4567aaec5 Mon Sep 17 00:00:00 2001
+From b3edeceb7c8c3b0eb70b26e3237afa5086afe8ed Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Fri, 26 Aug 2016 15:16:32 -0400
 Subject: [PATCH] rtl8xxxu: Implement rtl8188eu_active_to_emu()
diff --git a/package/kernel/mac80211/patches/657-0048-rtl8xxxu-Implement-rtl8188eu_power_off.patch b/package/kernel/mac80211/patches/660-0048-rtl8xxxu-Implement-rtl8188eu_power_off.patch
index bee2de1aa6..69b0f02852 100644
--- a/package/kernel/mac80211/patches/657-0048-rtl8xxxu-Implement-rtl8188eu_power_off.patch
+++ b/package/kernel/mac80211/patches/660-0048-rtl8xxxu-Implement-rtl8188eu_power_off.patch
@@ -1,4 +1,4 @@
-From 3b86cd428cc1338667585d6b6bffdabc6a601c5e Mon Sep 17 00:00:00 2001
+From 34e65b6f310234cf3e3629bd3d896a4f84df71f4 Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Fri, 26 Aug 2016 16:09:00 -0400
 Subject: [PATCH] rtl8xxxu: Implement rtl8188eu_power_off()
diff --git a/package/kernel/mac80211/patches/657-0049-rtl8xxxu-Add-rtl8188eu-USB-ID-for-D-Link-USB-GO-N150.patch b/package/kernel/mac80211/patches/660-0049-rtl8xxxu-Add-rtl8188eu-USB-ID-for-D-Link-USB-GO-N150.patch
index 5202f93834..1c3df95796 100644
--- a/package/kernel/mac80211/patches/657-0049-rtl8xxxu-Add-rtl8188eu-USB-ID-for-D-Link-USB-GO-N150.patch
+++ b/package/kernel/mac80211/patches/660-0049-rtl8xxxu-Add-rtl8188eu-USB-ID-for-D-Link-USB-GO-N150.patch
@@ -1,4 +1,4 @@
-From d86884a37489df6565f26cd1ac5afd130221d45a Mon Sep 17 00:00:00 2001
+From 5cd16e6a4660c07f01753e460eafdb805e71b9e9 Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Mon, 29 Aug 2016 12:55:37 -0400
 Subject: [PATCH] rtl8xxxu: Add rtl8188eu USB ID for D-Link USB-GO-N150
@@ -13,7 +13,7 @@ Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
 
 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
 +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
-@@ -6263,6 +6263,9 @@ static struct usb_device_id dev_table[]
+@@ -6315,6 +6315,9 @@ static struct usb_device_id dev_table[]
  /* Sitecom rtl8188eus */
  {USB_DEVICE_AND_INTERFACE_INFO(0x0df6, 0x0076, 0xff, 0xff, 0xff),
  	.driver_info = (unsigned long)&rtl8188eu_fops},
diff --git a/package/kernel/mac80211/patches/657-0050-rtl8xxxu-Clear-SYS_FUNC_UPLL-during-power-up-on-8188.patch b/package/kernel/mac80211/patches/660-0050-rtl8xxxu-Clear-SYS_FUNC_UPLL-during-power-up-on-8188.patch
index d7ef5719de..2c7413e35b 100644
--- a/package/kernel/mac80211/patches/657-0050-rtl8xxxu-Clear-SYS_FUNC_UPLL-during-power-up-on-8188.patch
+++ b/package/kernel/mac80211/patches/660-0050-rtl8xxxu-Clear-SYS_FUNC_UPLL-during-power-up-on-8188.patch
@@ -1,4 +1,4 @@
-From 069d586c5e930d99f6d543dfb1cded51f3b085a4 Mon Sep 17 00:00:00 2001
+From 59a94447d4a98ab56cefe0b277251c660a333ce0 Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Tue, 30 Aug 2016 14:33:18 -0400
 Subject: [PATCH] rtl8xxxu: Clear SYS_FUNC_UPLL during power up on 8188eu
diff --git a/package/kernel/mac80211/patches/657-0051-rtl8xxxu-Early-enable-of-WEP-TKIP-security-on-8188eu.patch b/package/kernel/mac80211/patches/660-0051-rtl8xxxu-Early-enable-of-WEP-TKIP-security-on-8188eu.patch
index d045fb8d2b..56be43a599 100644
--- a/package/kernel/mac80211/patches/657-0051-rtl8xxxu-Early-enable-of-WEP-TKIP-security-on-8188eu.patch
+++ b/package/kernel/mac80211/patches/660-0051-rtl8xxxu-Early-enable-of-WEP-TKIP-security-on-8188eu.patch
@@ -1,4 +1,4 @@
-From 88bfa209f803aa26c1fc2551455c2d1f11ee18ec Mon Sep 17 00:00:00 2001
+From 845f14c57fd50ec7e94f59bb1b5ad0cd1ecdbdd1 Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Tue, 30 Aug 2016 15:47:05 -0400
 Subject: [PATCH] rtl8xxxu: Early enable of WEP/TKIP security on 8188eu
diff --git a/package/kernel/mac80211/patches/657-0052-rtl8xxxu-Correct-power-down-sequence-for-8188eu.patch b/package/kernel/mac80211/patches/660-0052-rtl8xxxu-Correct-power-down-sequence-for-8188eu.patch
index 36f77a4e5f..603785b5d2 100644
--- a/package/kernel/mac80211/patches/657-0052-rtl8xxxu-Correct-power-down-sequence-for-8188eu.patch
+++ b/package/kernel/mac80211/patches/660-0052-rtl8xxxu-Correct-power-down-sequence-for-8188eu.patch
@@ -1,4 +1,4 @@
-From 9ee56fa1360109e26191e8151c60f203d3694d25 Mon Sep 17 00:00:00 2001
+From 2764703c3c896d427731391aa978c536aaf4cb91 Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Tue, 30 Aug 2016 17:23:35 -0400
 Subject: [PATCH] rtl8xxxu: Correct power down sequence for 8188eu
diff --git a/package/kernel/mac80211/patches/657-0053-rtl8xxxu-Reset-8188eu-REG_GPIO_MUXCFG-on-power-off.patch b/package/kernel/mac80211/patches/660-0053-rtl8xxxu-Reset-8188eu-REG_GPIO_MUXCFG-on-power-off.patch
index 954c933569..9da901f93b 100644
--- a/package/kernel/mac80211/patches/657-0053-rtl8xxxu-Reset-8188eu-REG_GPIO_MUXCFG-on-power-off.patch
+++ b/package/kernel/mac80211/patches/660-0053-rtl8xxxu-Reset-8188eu-REG_GPIO_MUXCFG-on-power-off.patch
@@ -1,4 +1,4 @@
-From b000940d5827a4fb54a7dbc3d15567d43ee03d4d Mon Sep 17 00:00:00 2001
+From 89bc2e59923ffc65b4b4fc123ef152c1a9a49639 Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Tue, 30 Aug 2016 17:30:14 -0400
 Subject: [PATCH] rtl8xxxu: Reset 8188eu REG_GPIO_MUXCFG on power off
diff --git a/package/kernel/mac80211/patches/657-0054-rtl8xxxu-Handle-devices-with-a-smaller-LLT-buffer.patch b/package/kernel/mac80211/patches/660-0054-rtl8xxxu-Handle-devices-with-a-smaller-LLT-buffer.patch
index ab70e97d5a..49a9f8bd8a 100644
--- a/package/kernel/mac80211/patches/657-0054-rtl8xxxu-Handle-devices-with-a-smaller-LLT-buffer.patch
+++ b/package/kernel/mac80211/patches/660-0054-rtl8xxxu-Handle-devices-with-a-smaller-LLT-buffer.patch
@@ -1,4 +1,4 @@
-From e323c5bec51a24315dd622587e9b9694c773d615 Mon Sep 17 00:00:00 2001
+From 5dd3f1799baf4683c0161f7e49d65bee17f3e35d Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Wed, 31 Aug 2016 16:31:38 -0400
 Subject: [PATCH] rtl8xxxu: Handle devices with a smaller LLT buffer
@@ -15,7 +15,7 @@ Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
 
 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
 +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
-@@ -1410,6 +1410,7 @@ struct rtl8xxxu_fileops {
+@@ -1411,6 +1411,7 @@ struct rtl8xxxu_fileops {
  	u8 page_num_hi;
  	u8 page_num_lo;
  	u8 page_num_norm;
diff --git a/package/kernel/mac80211/patches/657-0055-rtl8xxxu-Fix-reloading-of-driver-for-8188eu-devices.patch b/package/kernel/mac80211/patches/660-0055-rtl8xxxu-Fix-reloading-of-driver-for-8188eu-devices.patch
index 0a55888fd3..dc0b19161e 100644
--- a/package/kernel/mac80211/patches/657-0055-rtl8xxxu-Fix-reloading-of-driver-for-8188eu-devices.patch
+++ b/package/kernel/mac80211/patches/660-0055-rtl8xxxu-Fix-reloading-of-driver-for-8188eu-devices.patch
@@ -1,4 +1,4 @@
-From 8e911ff6eeeb1607dbc05d1782fd9c5cb54db068 Mon Sep 17 00:00:00 2001
+From 7b4161933d0a409023f5ef70cdc9296ab1cf5430 Mon Sep 17 00:00:00 2001
 From: Jes Sorensen <Jes.Sorensen@redhat.com>
 Date: Wed, 14 Sep 2016 14:10:42 -0400
 Subject: [PATCH] rtl8xxxu: Fix reloading of driver for 8188eu devices
diff --git a/package/kernel/mac80211/patches/660-0056-rtl8xxxu-Make-sure-to-enable-OFDM-paths-for-8188eu-i.patch b/package/kernel/mac80211/patches/660-0056-rtl8xxxu-Make-sure-to-enable-OFDM-paths-for-8188eu-i.patch
new file mode 100644
index 0000000000..b5c98ddbde
--- /dev/null
+++ b/package/kernel/mac80211/patches/660-0056-rtl8xxxu-Make-sure-to-enable-OFDM-paths-for-8188eu-i.patch
@@ -0,0 +1,39 @@
+From ba518f046cc1ce63b6984948b19b4d3903c5c30b Mon Sep 17 00:00:00 2001
+From: Jes Sorensen <Jes.Sorensen@redhat.com>
+Date: Mon, 3 Oct 2016 11:46:37 -0400
+Subject: [PATCH] rtl8xxxu: Make sure to enable OFDM paths for 8188eu in
+ rtl8188e_enable_rf()
+
+Failure to re-enable OFDM paths results in the dongle only receiving
+CCK packets which isn't overly exciting.
+
+Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
+---
+ drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
++++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
+@@ -1353,8 +1353,22 @@ void rtl8188eu_power_off(struct rtl8xxxu
+ 
+ static void rtl8188e_enable_rf(struct rtl8xxxu_priv *priv)
+ {
++	u32 val32;
++
+ 	rtl8xxxu_write8(priv, REG_RF_CTRL, RF_ENABLE | RF_RSTB | RF_SDMRSTB);
+ 
++	val32 = rtl8xxxu_read32(priv, REG_OFDM0_TRX_PATH_ENABLE);
++	val32 &= ~(OFDM_RF_PATH_RX_MASK | OFDM_RF_PATH_TX_MASK);
++	if (priv->rx_paths == 2)
++		val32 |= OFDM_RF_PATH_RX_A | OFDM_RF_PATH_RX_B;
++	else
++		val32 |= OFDM_RF_PATH_RX_A;
++	if (priv->tx_paths == 2)
++		val32 |= OFDM_RF_PATH_TX_A | OFDM_RF_PATH_TX_B;
++	else
++		val32 |= OFDM_RF_PATH_TX_A;
++	rtl8xxxu_write32(priv, REG_OFDM0_TRX_PATH_ENABLE, val32);
++
+ 	rtl8xxxu_write8(priv, REG_TXPAUSE, 0x00);
+ }
+ 
diff --git a/package/kernel/mac80211/patches/660-0057-rtl8xxxu-Add-rpt_sel-entry-to-struct-rtl8xxxu_rxdesc.patch b/package/kernel/mac80211/patches/660-0057-rtl8xxxu-Add-rpt_sel-entry-to-struct-rtl8xxxu_rxdesc.patch
new file mode 100644
index 0000000000..620783a89d
--- /dev/null
+++ b/package/kernel/mac80211/patches/660-0057-rtl8xxxu-Add-rpt_sel-entry-to-struct-rtl8xxxu_rxdesc.patch
@@ -0,0 +1,35 @@
+From f670de32e58c1623ee30d7511e62e7b7e2164684 Mon Sep 17 00:00:00 2001
+From: Jes Sorensen <Jes.Sorensen@redhat.com>
+Date: Tue, 4 Oct 2016 12:40:22 -0400
+Subject: [PATCH] rtl8xxxu: Add rpt_sel entry to struct rtl8xxxu_rxdesc16
+
+The 8188e supports TX reports which will show up as an RX packet,
+similar to how the gen2 parts handle it.
+
+Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
+---
+ drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
++++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
+@@ -161,7 +161,8 @@ struct rtl8xxxu_rxdesc16 {
+ 	u32 htc:1;
+ 	u32 eosp:1;
+ 	u32 bssidfit:2;
+-	u32 reserved1:16;
++	u32 rpt_sel:2;		/* 8188e */
++	u32 reserved1:14;
+ 	u32 unicastwake:1;
+ 	u32 magicwake:1;
+ 
+@@ -219,7 +220,8 @@ struct rtl8xxxu_rxdesc16 {
+ 
+ 	u32 magicwake:1;
+ 	u32 unicastwake:1;
+-	u32 reserved1:16;
++	u32 reserved1:14;
++	u32 rpt_sel:2;		/* 8188e */
+ 	u32 bssidfit:2;
+ 	u32 eosp:1;
+ 	u32 htc:1;