diff options
| author | Pekka Enberg | 2008-10-30 15:14:38 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2009-01-06 22:51:49 +0100 |
| commit | 1e8a2b60339a050f4fd383e332a5dd66b75f4f02 (patch) | |
| tree | 4caedc94ac170b32d18336833c9387a10b532078 /drivers/staging/winbond/mlmetxrx.c | |
| parent | Staging: w35und: clean up adapter.h a bit (diff) | |
| download | kernel-qcow2-linux-1e8a2b60339a050f4fd383e332a5dd66b75f4f02.tar.gz kernel-qcow2-linux-1e8a2b60339a050f4fd383e332a5dd66b75f4f02.tar.xz kernel-qcow2-linux-1e8a2b60339a050f4fd383e332a5dd66b75f4f02.zip | |
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.c')
| -rw-r--r-- | drivers/staging/winbond/mlmetxrx.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/winbond/mlmetxrx.c b/drivers/staging/winbond/mlmetxrx.c index ee80aed7f0b8..f3da9a6a85c1 100644 --- a/drivers/staging/winbond/mlmetxrx.c +++ b/drivers/staging/winbond/mlmetxrx.c @@ -19,7 +19,7 @@ #include "mds_f.h" -void MLMEResetTxRx(struct wb35_adapter * adapter) +void MLMEResetTxRx(struct wbsoft_priv * adapter) { s32 i; @@ -55,7 +55,7 @@ void MLMEResetTxRx(struct wb35_adapter * adapter) //============================================================================= /* FIXME: Should this just be replaced with kmalloc() and kfree()? */ -u8 *MLMEGetMMPDUBuffer(struct wb35_adapter * adapter) +u8 *MLMEGetMMPDUBuffer(struct wbsoft_priv * adapter) { s32 i; u8 *returnVal; @@ -73,7 +73,7 @@ u8 *MLMEGetMMPDUBuffer(struct wb35_adapter * adapter) } //============================================================================= -u8 MLMESendFrame(struct wb35_adapter * adapter, u8 *pMMPDU, u16 len, u8 DataType) +u8 MLMESendFrame(struct wbsoft_priv * adapter, u8 *pMMPDU, u16 len, u8 DataType) /* DataType : FRAME_TYPE_802_11_MANAGEMENT, FRAME_TYPE_802_11_MANAGEMENT_CHALLENGE, FRAME_TYPE_802_11_DATA */ { @@ -98,7 +98,7 @@ u8 MLMESendFrame(struct wb35_adapter * adapter, u8 *pMMPDU, u16 len, u8 DataType return true; } -void MLME_GetNextPacket(struct wb35_adapter *adapter, PDESCRIPTOR desc) +void MLME_GetNextPacket(struct wbsoft_priv *adapter, PDESCRIPTOR desc) { desc->InternalUsed = desc->buffer_start_index + desc->buffer_number; desc->InternalUsed %= MAX_DESCRIPTOR_BUFFER_INDEX; @@ -109,7 +109,7 @@ void MLME_GetNextPacket(struct wb35_adapter *adapter, PDESCRIPTOR desc) desc->Type = adapter->sMlmeFrame.DataType; } -void MLMEfreeMMPDUBuffer(struct wb35_adapter * adapter, s8 *pData) +void MLMEfreeMMPDUBuffer(struct wbsoft_priv * adapter, s8 *pData) { int i; @@ -127,7 +127,7 @@ void MLMEfreeMMPDUBuffer(struct wb35_adapter * adapter, s8 *pData) } void -MLME_SendComplete(struct wb35_adapter * adapter, u8 PacketID, unsigned char SendOK) +MLME_SendComplete(struct wbsoft_priv * adapter, u8 PacketID, unsigned char SendOK) { MLME_TXCALLBACK TxCallback; |