diff options
author | Hante Meuleman <meuleman@broadcom.com> | 2012-10-22 17:36:25 (GMT) |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-10-29 19:28:31 (GMT) |
commit | 0af29bf7c1ddf5f3c35577409de46ede5e8d7845 (patch) | |
tree | 4e4eb9e2e3d8c635a3848037b87b20ce5c61990c /drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c | |
parent | 9d7d6f95bda1fdc10847996ab849b5dd065bf047 (diff) | |
download | linux-fsl-qoriq-0af29bf7c1ddf5f3c35577409de46ede5e8d7845.tar.xz |
brcmfmac: use fwil for default configuration setup.
modify the setup code to use the refactored firmware interface layer.
Reviewed-by: Arend Van Spriel <arend@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c')
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c | 44 |
1 files changed, 6 insertions, 38 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c index b1f26b5..2976523 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c @@ -950,8 +950,6 @@ fail: int brcmf_bus_start(struct device *dev) { int ret = -1; - /* Room for "event_msgs" + '\0' + bitvec */ - char iovbuf[BRCMF_EVENTING_MASK_LEN + 12]; struct brcmf_bus *bus_if = dev_get_drvdata(dev); struct brcmf_pub *drvr = bus_if->drvr; struct brcmf_if *ifp; @@ -965,43 +963,16 @@ int brcmf_bus_start(struct device *dev) return ret; } - brcmf_c_mkiovar("event_msgs", drvr->eventmask, BRCMF_EVENTING_MASK_LEN, - iovbuf, sizeof(iovbuf)); - brcmf_proto_cdc_query_dcmd(drvr, 0, BRCMF_C_GET_VAR, iovbuf, - sizeof(iovbuf)); - memcpy(drvr->eventmask, iovbuf, BRCMF_EVENTING_MASK_LEN); - - setbit(drvr->eventmask, BRCMF_E_SET_SSID); - setbit(drvr->eventmask, BRCMF_E_PRUNE); - setbit(drvr->eventmask, BRCMF_E_AUTH); - setbit(drvr->eventmask, BRCMF_E_REASSOC); - setbit(drvr->eventmask, BRCMF_E_REASSOC_IND); - setbit(drvr->eventmask, BRCMF_E_DEAUTH_IND); - setbit(drvr->eventmask, BRCMF_E_DISASSOC_IND); - setbit(drvr->eventmask, BRCMF_E_DISASSOC); - setbit(drvr->eventmask, BRCMF_E_JOIN); - setbit(drvr->eventmask, BRCMF_E_ASSOC_IND); - setbit(drvr->eventmask, BRCMF_E_PSK_SUP); - setbit(drvr->eventmask, BRCMF_E_LINK); - setbit(drvr->eventmask, BRCMF_E_NDIS_LINK); - setbit(drvr->eventmask, BRCMF_E_MIC_ERROR); - setbit(drvr->eventmask, BRCMF_E_PMKID_CACHE); - setbit(drvr->eventmask, BRCMF_E_TXFAIL); - setbit(drvr->eventmask, BRCMF_E_JOIN_START); - setbit(drvr->eventmask, BRCMF_E_SCAN_COMPLETE); - setbit(drvr->eventmask, BRCMF_E_IF); - - /* Setup filter to allow only unicast */ - drvr->pktfilter_count = 1; - drvr->pktfilter[0] = "100 0 0 0 0x01 0x00"; - /* add primary networking interface */ - ifp = brcmf_add_if(dev, 0, 0, "wlan%d", drvr->mac); + ifp = brcmf_add_if(dev, 0, 0, "wlan%d", NULL); if (IS_ERR(ifp)) return PTR_ERR(ifp); - /* Bus is ready, do any protocol initialization */ - ret = brcmf_proto_init(drvr); + /* signal bus ready */ + bus_if->state = BRCMF_BUS_DATA; + + /* Bus is ready, do any initialization */ + ret = brcmf_c_preinit_dcmds(ifp); if (ret < 0) return ret; @@ -1016,9 +987,6 @@ int brcmf_bus_start(struct device *dev) return ret; } - - /* signal bus ready */ - bus_if->state = BRCMF_BUS_DATA; return 0; } |