[PATCH 0/3] Some fixes for r8192ee and r8821ae

[PATCH 0/3] Some fixes for r8192ee and r8821ae

[Larry Finger]

Initial testing of r8192ee builds has found two problems. The first of them
is caused by using the same rate-control algorithm as is used by driver rtlwifi
in the main wireless tree. As r8821ae also has the same (not yet reported) problem,
a fix for it is also included.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

Larry Finger (3):
  staging: r8192ee: Fix kernel WARN splat associated with rate control
  staging: r8192ee: Fix build errors when PCI is not available
  staging: r8821ae: Fix potential problem with rate control registration

 drivers/staging/rtl8192ee/Kconfig | 7 +++++++
 drivers/staging/rtl8192ee/rc.c    | 2 +-
 drivers/staging/rtl8821ae/rc.c    | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

-- 
1.8.4.5

[PATCH 1/3] staging: r8192ee: Fix kernel WARN splat associated with rate control

[Larry Finger]

The 0day kernel testing robot got the kernel warning caused by trying
to register a particular rate-control algorithm more than once. I believe
that the core already protects against a particular driver doing the
registration more than once, but an analysis of the code reveals that
the identical name is used for the rtlwifi drivers in the regular
wireless tree, and the staging drivers r8192ee and r8821ae. The fix
is to rename the algorithm used in r8192ee.

Reported-by: Jet Chen <jet.chen@intel.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Tested-by: Jet Chen <jet.chen@intel.com>
---
 drivers/staging/rtl8192ee/rc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/rtl8192ee/rc.c b/drivers/staging/rtl8192ee/rc.c
index f0ce6a9..c4c34dd 100644
--- a/drivers/staging/rtl8192ee/rc.c
+++ b/drivers/staging/rtl8192ee/rc.c
@@ -267,7 +267,7 @@ static void rtl_rate_free_sta(void *rtlpriv,
 }
 
 static struct rate_control_ops rtl_rate_ops = {
-	.name = "rtl_rc",
+	.name = "rtl_rc_92e",
 	.alloc = rtl_rate_alloc,
 	.free = rtl_rate_free,
 	.alloc_sta = rtl_rate_alloc_sta,
-- 
1.8.4.5

[PATCH 2/3] staging: r8192ee: Fix build errors when PCI is not available

[Larry Finger]

A build of this driver fails when PCI is not selected. It would also
fail if MAC80211 is not selected. Kconfig is fixed to handle these
conditions, and to select additional necessary components.

Reported-by: Randy Dunlap <rdunlap@infradead.org>
Reported-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
---
 drivers/staging/rtl8192ee/Kconfig | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/staging/rtl8192ee/Kconfig b/drivers/staging/rtl8192ee/Kconfig
index 92c5f44..beb07ac2 100644
--- a/drivers/staging/rtl8192ee/Kconfig
+++ b/drivers/staging/rtl8192ee/Kconfig
@@ -1,6 +1,13 @@
 config R8192EE
 	tristate "Realtek RTL8192EE Wireless Network Adapter"
+	depends on PCI && WLAN && MAC80211
+	depends on m
+	select WIRELESS_EXT
+	select WEXT_PRIV
+	select EEPROM_93CX6
+	select CRYPTO
 	select FW_LOADER
+	default N
 	---help---
 	This is the driver for Realtek RTL8192EE 802.11 PCIe
 	wireless network adapters.
-- 
1.8.4.5

[PATCH 3/3] staging: r8821ae: Fix potential problem with rate control registration

[Larry Finger]

The zero day testing facility reported a problem with duplicate
registration of the rate-control algorithm. Although not yet reported,
this driver needs the same fix.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
---
 drivers/staging/rtl8821ae/rc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/rtl8821ae/rc.c b/drivers/staging/rtl8821ae/rc.c
index 0cc32c6..a5a09ba 100644
--- a/drivers/staging/rtl8821ae/rc.c
+++ b/drivers/staging/rtl8821ae/rc.c
@@ -286,7 +286,7 @@ static void rtl_rate_free_sta(void *rtlpriv,
 }
 
 static struct rate_control_ops rtl_rate_ops = {
-	.name = "rtl_rc",
+	.name = "rtl_rc_21ae",
 	.alloc = rtl_rate_alloc,
 	.free = rtl_rate_free,
 	.alloc_sta = rtl_rate_alloc_sta,
-- 
1.8.4.5