From cb60072497a8d85186e6d75bf1ee0bd625b651ed Mon Sep 17 00:00:00 2001
From: Alwin Beukers <alwin@broadcom.com>
Date: Tue, 4 Oct 2011 23:19:10 +0200
Subject: [PATCH] --- yaml --- r: 268711 b: refs/heads/master c:
 68327a1910f4b32226de47f9443068ce511ae2de h: refs/heads/master i:   268709:
 3ec25ba5400177e4fb65beaa912b8046973eec59   268707:
 61632b23b1adca4f56fcb3e2a36ae3176b391396   268703:
 2f6a034f8c143419c59dcc24fbef9397803991f6 v: v3

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

diff --git a/[refs] b/[refs]
index 00990e0018e8..07712c8c8c2f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f90d23cf4124616f9a42036b50ba5cc3724868c
+refs/heads/master: 68327a1910f4b32226de47f9443068ce511ae2de
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/main.c b/trunk/drivers/staging/brcm80211/brcmsmac/main.c
index 30c5573e8866..9fa84858a8cf 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/main.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/main.c
@@ -5912,40 +5912,11 @@ int brcms_c_set_gmode(struct brcms_c_info *wlc, u8 gmode, bool config)
 	return ret;
 }
 
-static int brcms_c_nmode_validate(struct brcms_c_info *wlc, s32 nmode)
-{
-	int err = 0;
-
-	switch (nmode) {
-
-	case OFF:
-		break;
-
-	case AUTO:
-	case WL_11N_2x2:
-	case WL_11N_3x3:
-		if (!(BRCMS_PHY_11N_CAP(wlc->band)))
-			err = -EINVAL;
-		break;
-
-	default:
-		err = -EINVAL;
-		break;
-	}
-
-	return err;
-}
-
 int brcms_c_set_nmode(struct brcms_c_info *wlc)
 {
 	uint i;
-	int err;
 	s32 nmode = AUTO;
 
-	err = brcms_c_nmode_validate(wlc, nmode);
-	if (err)
-		return err;
-
 	if (wlc->stf->txstreams == WL_11N_3x3)
 		nmode = WL_11N_3x3;
 	else