diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/rtl8712/xmit_osdep.h | |
parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
download | op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.gz |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8712/xmit_osdep.h')
-rw-r--r-- | drivers/staging/rtl8712/xmit_osdep.h | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/drivers/staging/rtl8712/xmit_osdep.h b/drivers/staging/rtl8712/xmit_osdep.h new file mode 100644 index 0000000..ca43937 --- /dev/null +++ b/drivers/staging/rtl8712/xmit_osdep.h @@ -0,0 +1,38 @@ +#ifndef __XMIT_OSDEP_H_ +#define __XMIT_OSDEP_H_ + +#include "osdep_service.h" +#include "drv_types.h" + +struct pkt_file { + _pkt *pkt; + u32 pkt_len; /*the remainder length of the open_file*/ + _buffer *cur_buffer; + u8 *buf_start; + u8 *cur_addr; + u32 buf_len; +}; + +#define NR_XMITFRAME 256 + +struct xmit_priv; +struct pkt_attrib; +struct sta_xmit_priv; +struct xmit_frame; +struct xmit_buf; + +int r8712_xmit_entry(_pkt *pkt, struct net_device *pnetdev); +int r8712_xmit_resource_alloc(struct _adapter *padapter, + struct xmit_buf *pxmitbuf); +void r8712_xmit_resource_free(struct _adapter *padapter, + struct xmit_buf *pxmitbuf); + +void r8712_set_qos(struct pkt_file *ppktfile, + struct pkt_attrib *pattrib); +void _r8712_open_pktfile(_pkt *pktptr, struct pkt_file *pfile); +uint _r8712_pktfile_read(struct pkt_file *pfile, u8 *rmem, uint rlen); +sint r8712_endofpktfile(struct pkt_file *pfile); +void r8712_xmit_complete(struct _adapter *padapter, + struct xmit_frame *pxframe); + +#endif |