From 572d9ac84743baaca5d4f7a5f853e8484519dda5 Mon Sep 17 00:00:00 2001 From: Arend van Spriel Date: Wed, 29 Jun 2011 16:47:11 -0700 Subject: [PATCH] --- yaml --- r: 259779 b: refs/heads/master c: 933a1333ec8386866b609fe3f95541dbbb523a74 h: refs/heads/master i: 259777: 048a4f8873fc78b34d6779e8a639ea3f08d10cf5 259775: f58ab5751df39de2cb1b33e74324ff07b95c8b5e v: v3 --- [refs] | 2 +- trunk/drivers/staging/brcm80211/brcmfmac/dhd.h | 5 ----- trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 9 --------- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/[refs] b/[refs] index 2a19b1ba6ef0..6ece9d16babb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a84bac460364cad4a3954281808dec7395499178 +refs/heads/master: 933a1333ec8386866b609fe3f95541dbbb523a74 diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd.h b/trunk/drivers/staging/brcm80211/brcmfmac/dhd.h index d19d091195a6..3f1b757ed672 100644 --- a/trunk/drivers/staging/brcm80211/brcmfmac/dhd.h +++ b/trunk/drivers/staging/brcm80211/brcmfmac/dhd.h @@ -943,7 +943,6 @@ extern void brcmf_timeout_start(dhd_timeout_t *tmo, uint usec); extern int brcmf_timeout_expired(dhd_timeout_t *tmo); extern int brcmf_ifname2idx(struct dhd_info *dhd, char *name); -extern u8 *dhd_bssidx2bssid(dhd_pub_t *dhd, int idx); extern int brcmf_c_host_event(struct dhd_info *dhd, int *idx, void *pktdata, brcmf_event_msg_t *, void **data_ptr); @@ -964,11 +963,7 @@ extern void brcmf_vif_sendup(struct dhd_info *dhd, int ifidx, /* Send packet to dongle via data channel */ extern int brcmf_sendpkt(dhd_pub_t *dhdp, int ifidx, struct sk_buff *pkt); -/* Send event to host */ -extern void dhd_sendup_event(dhd_pub_t *dhdp, brcmf_event_msg_t *event, - void *data); extern int brcmf_bus_devreset(dhd_pub_t *dhdp, u8 flag); -extern uint dhd_bus_status(dhd_pub_t *dhdp); extern int brcmf_bus_start(dhd_pub_t *dhdp); extern void brcmf_wait_for_event(dhd_pub_t *dhd, bool * lockvar); diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c index 928220c80293..f3260715e478 100644 --- a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c +++ b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c @@ -2519,15 +2519,6 @@ dhd_wl_host_event(dhd_info_t *dhd, int *ifidx, void *pktdata, return bcmerror; } -/* send up locally generated event */ -void dhd_sendup_event(dhd_pub_t *dhdp, brcmf_event_msg_t *event, void *data) -{ - switch (be32_to_cpu(event->event_type)) { - default: - break; - } -} - void brcmf_wait_for_event(dhd_pub_t *dhd, bool *lockvar) { struct dhd_info *dhdinfo = dhd->info;