1 files changed, 61 insertions, 0 deletions

diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.25/0046-rtlwifi-rtl8192de-Fix-phy-based-version-calculation.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.25/0046-rtlwifi-rtl8192de-Fix-phy-based-version-calculation.patch
new file mode 100644
index 00000000..e52f4d78
--- /dev/null
+++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.25/0046-rtlwifi-rtl8192de-Fix-phy-based-version-calculation.patch
@@ -0,0 +1,61 @@
+From fccb712c5ec20bb379e0c57e6a8b286e117ee2db Mon Sep 17 00:00:00 2001
+From: Forest Bond <forest.bond@rapidrollout.com>
+Date: Fri, 13 Jul 2012 12:26:06 -0400
+Subject: [PATCH 46/73] rtlwifi: rtl8192de: Fix phy-based version calculation
+
+commit f1b00f4dab29b57bdf1bc03ef12020b280fd2a72 upstream.
+
+Commit d83579e2a50ac68389e6b4c58b845c702cf37516 incorporated some
+changes from the vendor driver that made it newly important that the
+calculated hardware version correctly include the CHIP_92D bit, as all
+of the IS_92D_* macros were changed to depend on it.  However, this bit
+was being unset for dual-mac, dual-phy devices.  The vendor driver
+behavior was modified to not do this, but unfortunately this change was
+not picked up along with the others.  This caused scanning in the 2.4GHz
+band to be broken, and possibly other bugs as well.
+
+This patch brings the version calculation logic in parity with the
+vendor driver in this regard, and in doing so fixes the regression.
+However, the version calculation code in general continues to be largely
+incoherent and messy, and needs to be cleaned up.
+
+Signed-off-by: Forest Bond <forest.bond@rapidrollout.com>
+Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
+Signed-off-by: John W. Linville <linville@tuxdriver.com>
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+---
+ drivers/net/wireless/rtlwifi/rtl8192de/phy.c |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/phy.c b/drivers/net/wireless/rtlwifi/rtl8192de/phy.c
+index 2cf4c5f..de9faa9 100644
+--- a/drivers/net/wireless/rtlwifi/rtl8192de/phy.c
++++ b/drivers/net/wireless/rtlwifi/rtl8192de/phy.c
+@@ -3462,21 +3462,21 @@ void rtl92d_phy_config_macphymode_info(struct ieee80211_hw *hw)
+        switch (rtlhal->macphymode) {
+        case DUALMAC_SINGLEPHY:
+                rtlphy->rf_type = RF_2T2R;
+-               rtlhal->version |= CHIP_92D_SINGLEPHY;
++               rtlhal->version |= RF_TYPE_2T2R;
+                rtlhal->bandset = BAND_ON_BOTH;
+                rtlhal->current_bandtype = BAND_ON_2_4G;
+                break;
+ 
+        case SINGLEMAC_SINGLEPHY:
+                rtlphy->rf_type = RF_2T2R;
+-               rtlhal->version |= CHIP_92D_SINGLEPHY;
++               rtlhal->version |= RF_TYPE_2T2R;
+                rtlhal->bandset = BAND_ON_BOTH;
+                rtlhal->current_bandtype = BAND_ON_2_4G;
+                break;
+ 
+        case DUALMAC_DUALPHY:
+                rtlphy->rf_type = RF_1T1R;
+-               rtlhal->version &= (~CHIP_92D_SINGLEPHY);
++               rtlhal->version &= RF_TYPE_1T1R;
+                /* Now we let MAC0 run on 5G band. */
+                if (rtlhal->interfaceindex == 0) {
+                        rtlhal->bandset = BAND_ON_5G;
+-- 
+1.7.7.6
+