From f011b73a1630aa6e9337f0aa3942990db6c9102f Mon Sep 17 00:00:00 2001
From: Roland Vossen <rvossen@broadcom.com>
Date: Mon, 12 Sep 2011 12:14:58 +0200
Subject: [PATCH] --- yaml --- r: 268359 b: refs/heads/master c:
 e046da4fd91f203899261dcf6bc7c2d997398dec h: refs/heads/master i:   268357:
 0569f828c222b596b9f213ed9edb10e069c842fe   268355:
 02136832395e60ddcc5545f31b3cd1358be5cb17   268351:
 8f580e11405a05d5bd6544ea76b2eddaa65666d3 v: v3

---
 [refs]                                        |  2 +-
 .../drivers/staging/brcm80211/brcmsmac/main.c |  2 --
 .../drivers/staging/brcm80211/brcmsmac/stf.c  | 26 -------------------
 3 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/[refs] b/[refs]
index fab2304777a3..7281e753efa7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72660455c3b3fb2a666e5d58e2ff3a07f8f06533
+refs/heads/master: e046da4fd91f203899261dcf6bc7c2d997398dec
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/main.c b/trunk/drivers/staging/brcm80211/brcmsmac/main.c
index d30116d97b14..7ebe0607a846 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/main.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/main.c
@@ -5982,8 +5982,6 @@ int brcms_c_set_nmode(struct brcms_c_info *wlc, s32 nmode)
 		for (i = 0; i < wlc->pub->_nbands; i++) {
 			memset(wlc->bandstate[i]->hw_rateset.mcs, 0,
 			       MCSSET_LEN);
-			if (IS_MCS(0))
-				brcms_c_reprate_init(wlc);
 		}
 		break;
 
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/stf.c b/trunk/drivers/staging/brcm80211/brcmsmac/stf.c
index 71c5d2379571..82805e0a826c 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/stf.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/stf.c
@@ -291,32 +291,6 @@ int brcms_c_stf_txchain_set(struct brcms_c_info *wlc, s32 int_val, bool force)
 	if (txstreams > MAX_STREAMS_SUPPORTED)
 		return -EINVAL;
 
-	if (txstreams == 1) {
-		for (i = 0; i < wlc->pub->_nbands; i++)
-			if ((RSPEC_STF(0) !=
-			     PHY_TXC1_MODE_SISO)
-			    || (RSPEC_STF(0) !=
-				PHY_TXC1_MODE_SISO)) {
-				if (!force)
-					return -EBADE;
-
-				/* over-write the override rspec */
-				if (RSPEC_STF(0)
-				    != PHY_TXC1_MODE_SISO) {
-					wiphy_err(wlc->wiphy, "%s(): temp "
-						  "sense override non-SISO "
-						  "rspec_override\n",
-						  __func__);
-				}
-				if (RSPEC_STF(0) != PHY_TXC1_MODE_SISO) {
-					wiphy_err(wlc->wiphy, "%s(): temp "
-						  "sense override non-SISO "
-						  "mrspec_override\n",
-						  __func__);
-				}
-			}
-	}
-
 	wlc->stf->txchain = txchain;
 	wlc->stf->txstreams = txstreams;
 	brcms_c_stf_stbc_tx_set(wlc, wlc->band->band_stf_stbc_tx);