summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
diff options
context:
space:
mode:
authorHauke Mehrtens2012-06-30 15:16:19 +0200
committerJohn W. Linville2012-07-10 18:16:56 +0200
commitcacaa64be6c7806fff90bc090a08da02be872d20 (patch)
treee95e88fdc26f3c69fd32234606c626d4dc602a54 /drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
parentbrcmsmac: fix DMA on SoCs (diff)
downloadkernel-qcow2-linux-cacaa64be6c7806fff90bc090a08da02be872d20.tar.gz
kernel-qcow2-linux-cacaa64be6c7806fff90bc090a08da02be872d20.tar.xz
kernel-qcow2-linux-cacaa64be6c7806fff90bc090a08da02be872d20.zip
brcmsmac: extend brcms_c_chipmatch() to also handle non PCIe devices
Now brcms_c_chipmatch() is also able to handle non PCI devices and also does some checking for SoC if they are supported by brcmsmac. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Acked-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c')
-rw-r--r--drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
index 2d5a40412690..2b57f57a7927 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
@@ -319,8 +319,7 @@ static void brcms_ops_stop(struct ieee80211_hw *hw)
return;
spin_lock_bh(&wl->lock);
- status = brcms_c_chipmatch(wl->wlc->hw->vendorid,
- wl->wlc->hw->deviceid);
+ status = brcms_c_chipmatch(wl->wlc->hw->d11core);
spin_unlock_bh(&wl->lock);
if (!status) {
wiphy_err(wl->wiphy,