staging: brcm80211: remove N mode validation function
authorAlwin Beukers <alwin@broadcom.com>
Tue, 4 Oct 2011 21:19:10 +0000 (23:19 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 5 Oct 2011 20:39:05 +0000 (13:39 -0700)
Removed the brcms_c_nmode_validate function as it only checks N-mode
capability, which should always be true.

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>
drivers/staging/brcm80211/brcmsmac/main.c

index 30c5573e8866550bf95d1b4e9ff1377a5f7a49c1..9fa84858a8cff17c424ecb3851c9fec6e0dd1257 100644 (file)
@@ -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