Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 268711
b: refs/heads/master
c: 68327a1
h: refs/heads/master
i:
  268709: 3ec25ba
  268707: 61632b2
  268703: 2f6a034
v: v3
  • Loading branch information
Alwin Beukers authored and Greg Kroah-Hartman committed Oct 5, 2011
1 parent e3fdabb commit cb60072
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 30 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0f90d23cf4124616f9a42036b50ba5cc3724868c
refs/heads/master: 68327a1910f4b32226de47f9443068ce511ae2de
29 changes: 0 additions & 29 deletions trunk/drivers/staging/brcm80211/brcmsmac/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit cb60072

Please sign in to comment.