diff options
Diffstat (limited to 'drivers/net/wireless/bcmdhd/dhd_proto.h')
| -rw-r--r-- | drivers/net/wireless/bcmdhd/dhd_proto.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/net/wireless/bcmdhd/dhd_proto.h b/drivers/net/wireless/bcmdhd/dhd_proto.h index 09d546809db..21dfe238008 100644 --- a/drivers/net/wireless/bcmdhd/dhd_proto.h +++ b/drivers/net/wireless/bcmdhd/dhd_proto.h @@ -24,7 +24,7 @@ * software in any way with any other Broadcom software provided under a license * other than the GPL, without Broadcom's express prior written consent. * - * $Id: dhd_proto.h 343390 2012-07-06 22:34:19Z $ + * $Id: dhd_proto.h 364579 2012-10-24 17:56:37Z $ */ #ifndef _dhd_proto_h_ @@ -54,10 +54,6 @@ extern int dhd_prot_init(dhd_pub_t *dhdp); /* Stop protocol: sync w/dongle state. */ extern void dhd_prot_stop(dhd_pub_t *dhdp); -#ifdef PROP_TXSTATUS -extern int dhd_wlfc_init(dhd_pub_t *dhd); -extern void dhd_wlfc_deinit(dhd_pub_t *dhd); -#endif /* PROP_TXSTATUS */ /* Add any protocol-specific data header. * Caller must reserve prot_hdrlen prepend space. @@ -88,9 +84,10 @@ extern int dhd_ioctl(dhd_pub_t * dhd_pub, dhd_ioctl_t *ioc, void * buf, uint buf extern int dhd_preinit_ioctls(dhd_pub_t *dhd); #ifdef PROP_TXSTATUS -extern int dhd_wlfc_enque_sendq(void* state, int prec, void* p); -extern int dhd_wlfc_commit_packets(void* state, f_commitpkt_t fcommit, void* commit_ctx); -extern void dhd_wlfc_cleanup(dhd_pub_t *dhd); +extern int dhd_wlfc_commit_packets(void* state, f_commitpkt_t fcommit, + void* commit_ctx, void *pktbuf); +extern void dhd_wlfc_cleanup(dhd_pub_t *dhd, ifpkt_cb_t fn, int arg); +extern bool ifpkt_fn(void* p, int ifid); #endif /* PROP_TXSTATUS */ extern int dhd_process_pkt_reorder_info(dhd_pub_t *dhd, uchar *reorder_info_buf, @@ -104,8 +101,6 @@ extern int dhd_process_pkt_reorder_info(dhd_pub_t *dhd, uchar *reorder_info_buf, #define DHD_PROTOCOL "bdc" #elif defined(CDC) #define DHD_PROTOCOL "cdc" -#elif defined(RNDIS) -#define DHD_PROTOCOL "rndis" #else #define DHD_PROTOCOL "unknown" #endif /* proto */ |