Commit 41d8532b authored by Dragoslav Zaric's avatar Dragoslav Zaric Committed by Greg Kroah-Hartman
Browse files

Staging: otus: 80211core/amsdu.c: Fix Coding Style 



Signed-off-by: default avatarDragoslav Zaric <dragoslav.zaric.kd@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent aef911a5

drivers/staging/otus/80211core/amsdu.c

+70 −75
Original line number Diff line number Diff line
@@ -44,33 +44,33 @@ zbuf_t* zfGetAmsduSubFrame(zdev_t* dev, zbuf_t* buf, u16_t* offset) 


	/* Verify A-MSDU length */

	if (amsduLen < (*offset + 14))

    {

		return NULL;

    }



	/* Locate A-MSDU subframe by offset and verify subframe length */

	subframeLen = (zmw_buf_readb(dev, buf, *offset + 12) << 8) +

		zmw_buf_readb(dev, buf, *offset + 13);



	if (subframeLen == 0)

    {

		return NULL;

    }



	/* Verify A-MSDU subframe length */

    if ((*offset+14+subframeLen) <= amsduLen)

    {

	if ((*offset+14+subframeLen) <= amsduLen) {

		/* Allocate a new buffer */

        if ((newBuf = zfwBufAllocate(dev, 24+2+subframeLen)) != NULL)

        {

		newBuf = zfwBufAllocate(dev, 24+2+subframeLen);

		if (newBuf != NULL) {

			#ifdef ZM_ENABLE_NATIVE_WIFI

            /* Copy and convert subframe to wlan frame format */

            /* SHALL NOT INCLUDE QOS and AMSDU header. Ray 20070807 For Vista */

			/* Copy and convert subframe to wlan frame format

			* SHALL NOT INCLUDE QOS and AMSDU header.

			* Ray 20070807 For Vista

			*/

			zfRxBufferCopy(dev, newBuf, buf, 0, 0, 24);

            zfRxBufferCopy(dev, newBuf, buf, 24, *offset+14, subframeLen);

			zfRxBufferCopy(dev, newBuf, buf, 24, *offset+14,

					subframeLen);

			zfwBufSetSize(dev, newBuf, 24+subframeLen);

			#else

			/* Copy subframe to new buffer */

            zfRxBufferCopy(dev, newBuf, buf, 0, *offset, 14+subframeLen);

			zfRxBufferCopy(dev, newBuf, buf, 0, *offset,

					14+subframeLen);

			zfwBufSetSize(dev, newBuf, 14+subframeLen);

			#endif

			/* Update offset */
@@ -110,20 +110,15 @@ void zfDeAmsdu(zdev_t* dev, zbuf_t* buf, u16_t vap, u8_t encryMode) 
	ZM_BUFFER_TRACE(dev, buf)



	if (encryMode == ZM_AES || encryMode == ZM_TKIP)

    {

		offset += (ZM_SIZE_OF_IV + ZM_SIZE_OF_EXT_IV);

    }

	else if (encryMode == ZM_WEP64 || encryMode == ZM_WEP128)

    {

		offset += ZM_SIZE_OF_IV;

    }





	/* Repeatly calling zfGetAmsduSubFrame() until NULL returned */

    while ((subframeBuf = zfGetAmsduSubFrame(dev, buf, &offset)) != NULL)

    {

	while ((subframeBuf = zfGetAmsduSubFrame(dev, buf, &offset)) != NULL) {

		wd->commTally.NotifyNDISRxFrmCnt++;

        if (wd->zfcbRecvEth != NULL)

    	{

		if (wd->zfcbRecvEth != NULL) {

			wd->zfcbRecvEth(dev, subframeBuf, (u8_t)vap);

			ZM_PERFORMANCE_RX_MSDU(dev, wd->tick);

		}