From: Alwin Beukers <alwin@broadcom.com>
Date: Tue, 4 Oct 2011 21:19:02 +0000 (+0200)
Subject: staging: brcm80211: removed redundant code from brcms_c_set_gmode
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=b2d62733e6ea427921e201269c1b55bca3a87936;p=deliverable%2Flinux.git

staging: brcm80211: removed redundant code from brcms_c_set_gmode

The comment says the rateset is being cleared when switching to GMODE_LEGACY_B,
but the code that follows it does not do so. Besides, the rateset is already
valid at this point.

Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/brcm80211/brcmsmac/main.c b/drivers/staging/brcm80211/brcmsmac/main.c
index 33497164ac61..9988e03b7cf5 100644
--- a/drivers/staging/brcm80211/brcmsmac/main.c
+++ b/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;