diff options
| author | Pekka Enberg <penberg@cs.helsinki.fi> | 2008-10-30 16:14:38 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-06 13:51:49 -0800 |
| commit | 1e8a2b60339a050f4fd383e332a5dd66b75f4f02 (patch) | |
| tree | 4caedc94ac170b32d18336833c9387a10b532078 /drivers/staging/winbond/mlmetxrx_f.h | |
| parent | ac418b8faaaad7a17474c8fba5c2e5917c91cf31 (diff) | |
Staging: w35und: merge struct wb35_adapter to struct wbsoft_priv
This patch merges struct wb35_adapter to struct wbsoft_priv. Now we can finally
start passing a pointer to struct ieee80211_hw around where necessary.
Acked-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/winbond/mlmetxrx_f.h')
| -rw-r--r-- | drivers/staging/winbond/mlmetxrx_f.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/staging/winbond/mlmetxrx_f.h b/drivers/staging/winbond/mlmetxrx_f.h index 0f264ed64ea..905c301028a 100644 --- a/drivers/staging/winbond/mlmetxrx_f.h +++ b/drivers/staging/winbond/mlmetxrx_f.h @@ -8,34 +8,34 @@ #ifndef _MLMETXRX_H #define _MLMETXRX_H -#include "adapter.h" +#include "core.h" void MLMEProcThread( - struct wb35_adapter * adapter + struct wbsoft_priv * adapter ); -void MLMEResetTxRx( struct wb35_adapter * adapter); +void MLMEResetTxRx( struct wbsoft_priv * adapter); u8 * MLMEGetMMPDUBuffer( - struct wb35_adapter * adapter + struct wbsoft_priv * adapter ); -void MLMEfreeMMPDUBuffer( struct wb35_adapter * adapter, s8 * pData); +void MLMEfreeMMPDUBuffer( struct wbsoft_priv * adapter, s8 * pData); -void MLME_GetNextPacket( struct wb35_adapter * adapter, PDESCRIPTOR pDes ); -u8 MLMESendFrame( struct wb35_adapter * 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 wb35_adapter * adapter, u8 PacketID, unsigned char SendOK ); +MLME_SendComplete( struct wbsoft_priv * adapter, u8 PacketID, unsigned char SendOK ); void MLMERcvFrame( - struct wb35_adapter * adapter, + struct wbsoft_priv * adapter, PRXBUFFER pRxBufferArray, u8 NumOfBuffer, u8 ReturnSlotIndex @@ -43,11 +43,11 @@ MLMERcvFrame( void MLMEReturnPacket( - struct wb35_adapter * adapter, + struct wbsoft_priv * adapter, u8 * pRxBufer ); #ifdef _IBSS_BEACON_SEQ_STICK_ -s8 SendBCNullData(struct wb35_adapter * adapter, u16 wIdx); +s8 SendBCNullData(struct wbsoft_priv * adapter, u16 wIdx); #endif #endif |