---

yaml --- r: 268359 b: refs/heads/master c: e046da4 h: refs/heads/master i: 268357: 0569f82 268355: 0213683 268351: 8f580e1 v: v3
git-mirror · Sep 12, 2011 · f011b73 · f011b73
1 parent 2667993
commit f011b73
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 29 deletions.
diff --git 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
@@ -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
@@ -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);