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;