Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 342093
b: refs/heads/master
c: 9dd4ea5
h: refs/heads/master
i:
  342091: 66bdab4
v: v3
  • Loading branch information
Hauke Mehrtens authored and John W. Linville committed Dec 10, 2012
1 parent cff7ce8 commit 9eb0392
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 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: 512ae05611179e6e98a48b5ddc4d263b7eb8a587
refs/heads/master: 9dd4ea51544de0f9679630592daa3d2147f298ed
5 changes: 3 additions & 2 deletions trunk/drivers/net/wireless/brcm80211/brcmsmac/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -4500,7 +4500,8 @@ static int brcms_b_attach(struct brcms_c_info *wlc, struct bcma_device *core,

/* check device id(srom, nvram etc.) to set bands */
if (wlc_hw->deviceid == BCM43224_D11N_ID ||
wlc_hw->deviceid == BCM43224_D11N_ID_VEN1)
wlc_hw->deviceid == BCM43224_D11N_ID_VEN1 ||
wlc_hw->deviceid == BCM43224_CHIP_ID)
/* Dualband boards */
wlc_hw->_nbands = 2;
else
Expand Down Expand Up @@ -5653,7 +5654,7 @@ static bool brcms_c_chipmatch_pci(struct bcma_device *core)
return false;
}

if (device == BCM43224_D11N_ID_VEN1)
if (device == BCM43224_D11N_ID_VEN1 || device == BCM43224_CHIP_ID)
return true;
if ((device == BCM43224_D11N_ID) || (device == BCM43225_D11N2G_ID))
return true;
Expand Down

0 comments on commit 9eb0392

Please sign in to comment.