From: Pekka Enberg Date: Mon, 27 Oct 2008 22:14:14 +0000 (+0200) Subject: Staging: w35und: remove macro magic from MLME_GetNextPacket() X-Git-Tag: v2.6.29-rc1~228^2~216 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3c01ec0d82885d4764d066c9a1e3a431e6fb0f04;p=linux-2.6-omap-h63xx.git Staging: w35und: remove macro magic from MLME_GetNextPacket() This removes the macro magic from MLME_GetNextPacket() to de-obfuscate the code. Signed-off-by: Pekka Enberg Acked-by: Pavel Machek Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/winbond/mlmetxrx.c b/drivers/staging/winbond/mlmetxrx.c index eab562a6c2f..a071855d744 100644 --- a/drivers/staging/winbond/mlmetxrx.c +++ b/drivers/staging/winbond/mlmetxrx.c @@ -96,21 +96,15 @@ u8 MLMESendFrame(struct wb35_adapter * adapter, u8 *pMMPDU, u16 len, u8 DataType return true; } -void -MLME_GetNextPacket(struct wb35_adapter * adapter, PDESCRIPTOR pDes) +void MLME_GetNextPacket(struct wb35_adapter *adapter, PDESCRIPTOR desc) { -#define DESCRIPTOR_ADD_BUFFER( _D, _A, _S ) \ -{\ - _D->InternalUsed = _D->buffer_start_index + _D->buffer_number; \ - _D->InternalUsed %= MAX_DESCRIPTOR_BUFFER_INDEX; \ - _D->buffer_address[ _D->InternalUsed ] = _A; \ - _D->buffer_size[ _D->InternalUsed ] = _S; \ - _D->buffer_total_size += _S; \ - _D->buffer_number++;\ -} - - DESCRIPTOR_ADD_BUFFER( pDes, adapter->sMlmeFrame.pMMPDU, adapter->sMlmeFrame.len ); - pDes->Type = adapter->sMlmeFrame.DataType; + desc->InternalUsed = desc->buffer_start_index + desc->buffer_number; + desc->InternalUsed %= MAX_DESCRIPTOR_BUFFER_INDEX; + desc->buffer_address[desc->InternalUsed] = adapter->sMlmeFrame.pMMPDU; + desc->buffer_size[desc->InternalUsed] = adapter->sMlmeFrame.len; + desc->buffer_total_size += adapter->sMlmeFrame.len; + desc->buffer_number++; + desc->Type = adapter->sMlmeFrame.DataType; } void MLMEfreeMMPDUBuffer(struct wb35_adapter * adapter, s8 *pData)