From 2f6a034f8c143419c59dcc24fbef9397803991f6 Mon Sep 17 00:00:00 2001
From: Alwin Beukers <alwin@broadcom.com>
Date: Tue, 4 Oct 2011 23:19:02 +0200
Subject: [PATCH] --- yaml --- r: 268703 b: refs/heads/master c:
 b2d62733e6ea427921e201269c1b55bca3a87936 h: refs/heads/master i:   268701:
 941ee476fd03515eca2b11b7180d7c2e7cee9cfe   268699:
 14ded7ded31ac931f7be1c46f0500b84cbb95633   268695:
 f3a9079614487ecbd79fc165a40fa6c3a5e8e18b   268687:
 2d6fefb9dc69ea01353a9f0fc04f96c029234969   268671:
 3f1ae0d83c482de13fa8fab25deae9b3ef9cdd75 v: v3

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

diff --git a/[refs] b/[refs]
index eba82db5b51d..8226c076b4e7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96b74847813ace67a7778c9f0c86958b17b36d3c
+refs/heads/master: b2d62733e6ea427921e201269c1b55bca3a87936
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/main.c b/trunk/drivers/staging/brcm80211/brcmsmac/main.c
index 33497164ac61..9988e03b7cf5 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/main.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/main.c
@@ -5965,13 +5965,6 @@ int brcms_c_set_gmode(struct brcms_c_info *wlc, u8 gmode, bool config)
 		return -ENOTSUPP;
 	}
 
-	/*
-	 * If we are switching to gmode == GMODE_LEGACY_B,
-	 * clean up rate info that may refer to OFDM rates.
-	 */
-	if ((gmode == GMODE_LEGACY_B) && (band->gmode != GMODE_LEGACY_B))
-		band->gmode = gmode;
-
 	band->gmode = gmode;
 
 	wlc->shortslot_override = shortslot;