diff options
| author | Frederic Weisbecker | 2009-10-18 01:09:09 +0200 |
|---|---|---|
| committer | Frederic Weisbecker | 2009-10-18 01:12:33 +0200 |
| commit | 0f8f86c7bdd1c954fbe153af437a0d91a6c5721a (patch) | |
| tree | 94a8d419a470a4f9852ca397bb9bbe48db92ff5c /drivers/staging/winbond/mlmetxrx_f.h | |
| parent | Merge branch 'linus' into tracing/hw-breakpoints (diff) | |
| parent | perf tools: Move dereference after NULL test (diff) | |
| download | kernel-qcow2-linux-0f8f86c7bdd1c954fbe153af437a0d91a6c5721a.tar.gz kernel-qcow2-linux-0f8f86c7bdd1c954fbe153af437a0d91a6c5721a.tar.xz kernel-qcow2-linux-0f8f86c7bdd1c954fbe153af437a0d91a6c5721a.zip | |
Merge commit 'perf/core' into perf/hw-breakpoint
Conflicts:
kernel/Makefile
kernel/trace/Makefile
kernel/trace/trace.h
samples/Makefile
Merge reason: We need to be uptodate with the perf events development
branch because we plan to rewrite the breakpoints API on top of
perf events.
Diffstat (limited to 'drivers/staging/winbond/mlmetxrx_f.h')
| -rw-r--r-- | drivers/staging/winbond/mlmetxrx_f.h | 32 |
1 files changed, 6 insertions, 26 deletions
diff --git a/drivers/staging/winbond/mlmetxrx_f.h b/drivers/staging/winbond/mlmetxrx_f.h index 5f05a6e1cda0..6c04e3e03e31 100644 --- a/drivers/staging/winbond/mlmetxrx_f.h +++ b/drivers/staging/winbond/mlmetxrx_f.h @@ -10,36 +10,16 @@ #include "core.h" -void -MLMEProcThread( - struct wbsoft_priv * adapter - ); - -void MLME_GetNextPacket( struct wbsoft_priv * adapter, PDESCRIPTOR pDes ); -u8 MLMESendFrame( struct wbsoft_priv * adapter, - u8 *pMMPDU, - u16 len, - u8 DataType); - -void -MLME_SendComplete( struct wbsoft_priv * adapter, u8 PacketID, unsigned char SendOK ); +void MLME_GetNextPacket(struct wbsoft_priv *adapter, struct wb35_descriptor *pDes); +u8 MLMESendFrame(struct wbsoft_priv *adapter, + u8 * pMMPDU, u16 len, u8 DataType); void -MLMERcvFrame( - struct wbsoft_priv * adapter, - PRXBUFFER pRxBufferArray, - u8 NumOfBuffer, - u8 ReturnSlotIndex - ); +MLME_SendComplete(struct wbsoft_priv *adapter, u8 PacketID, + unsigned char SendOK); -void -MLMEReturnPacket( - struct wbsoft_priv * adapter, - u8 * pRxBufer - ); #ifdef _IBSS_BEACON_SEQ_STICK_ -s8 SendBCNullData(struct wbsoft_priv * adapter, u16 wIdx); +s8 SendBCNullData(struct wbsoft_priv *adapter, u16 wIdx); #endif #endif - |