Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26908c9b authored by Max Tottenham's avatar Max Tottenham Committed by Greg Kroah-Hartman
Browse files

Staging: bcm: IPv6Protocol.c: Fix coding style 



The first in a series of 8 patches to fix IPv6Protocol.c
This first patch fixes formatting issues for braced statements
(e.g. if/for/while)

Signed-off-by: default avatarMax Tottenham <mtottenh@gmail.com>
Acked-by: default avatarKevin McKinney <klmckinney1@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d740e889

drivers/staging/bcm/IPv6Protocol.c

+62 −96
Original line number Diff line number Diff line
@@ -11,18 +11,16 @@ static UCHAR * GetNextIPV6ChainedHeader(UCHAR **ppucPayload,UCHAR *pucNextHeader 
	USHORT  usNextHeaderOffset = 0 ;

	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);



	if((NULL == ppucPayload) || (*pusPayloadLength == 0) || (*bParseDone))

	{

	if ((NULL == ppucPayload) || (*pusPayloadLength == 0) ||

		(*bParseDone)) {

		*bParseDone = TRUE;

		return NULL;



	}



	pucRetHeaderPtr = *ppucPayload;

	pucPayloadPtr = *ppucPayload;



	if(!pucRetHeaderPtr || !pucPayloadPtr)

	{

	if (!pucRetHeaderPtr || !pucPayloadPtr) {

		*bParseDone = TRUE;

		return NULL;

	}
@@ -31,9 +29,7 @@ static UCHAR * GetNextIPV6ChainedHeader(UCHAR **ppucPayload,UCHAR *pucNextHeader 
	*bParseDone = FALSE;







	switch(*pucNextHeader)

	{

	switch (*pucNextHeader) {

	case IPV6HDR_TYPE_HOPBYHOP:

		{
@@ -112,14 +108,10 @@ static UCHAR * GetNextIPV6ChainedHeader(UCHAR **ppucPayload,UCHAR *pucNextHeader 


	}



	if(*bParseDone == FALSE)

	{

		if(*pusPayloadLength <= usNextHeaderOffset)

		{

	if (*bParseDone == FALSE) {

		if(*pusPayloadLength <= usNextHeaderOffset) {

			*bParseDone = TRUE;

		}

		else

		{

		} else {

			*pucNextHeader = *pucPayloadPtr;

			pucPayloadPtr += usNextHeaderOffset;

			(*pusPayloadLength) -= usNextHeaderOffset;
@@ -127,8 +119,6 @@ static UCHAR * GetNextIPV6ChainedHeader(UCHAR **ppucPayload,UCHAR *pucNextHeader 


	}







	*ppucPayload = pucPayloadPtr;

	return pucRetHeaderPtr;

}
@@ -142,20 +132,16 @@ static UCHAR GetIpv6ProtocolPorts(UCHAR *pucPayload,USHORT *pusSrcPort,USHORT *p 
	UCHAR *pucNextHeader = NULL;

	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);



	if( !pucPayload || (usPayloadLength == 0))

	{

	if ( !pucPayload || (usPayloadLength == 0)) {

		return 0;

	}



	*pusSrcPort = *pusDestPort = 0;

	ucHeaderType = ucNextHeader;

	while(!bDone)

	{

	while (!bDone) {

		pucNextHeader = GetNextIPV6ChainedHeader(&pIpv6HdrScanContext,&ucHeaderType,&bDone,&usPayloadLength);

		if(bDone)

		{

			if((ucHeaderType==TCP_HEADER_TYPE) || (ucHeaderType == UDP_HEADER_TYPE))

			{

		if(bDone) {

			if((ucHeaderType==TCP_HEADER_TYPE) || (ucHeaderType == UDP_HEADER_TYPE)) {

				 *pusSrcPort=*((PUSHORT)(pucNextHeader));

				 *pusDestPort=*((PUSHORT)(pucNextHeader+2));

				 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, " \nProtocol Ports - Src Port :0x%x Dest Port : 0x%x",ntohs(*pusSrcPort),ntohs(*pusDestPort));
@@ -192,17 +178,14 @@ USHORT IpVersion6(PMINI_ADAPTER Adapter, /**< Pointer to the driver control stru 
							pstIpv6Header->usPayloadLength,

							pstIpv6Header->ucNextHeader);



	do

	{

		if(0 == pstClassifierRule->ucDirection)

		{

	do {

		if (0 == pstClassifierRule->ucDirection) {

			//cannot be processed for classification.

		   // it is a down link connection

			break;

		}



		if(!pstClassifierRule->bIpv6Protocol)

		{

		if (!pstClassifierRule->bIpv6Protocol) {

			//We are looking for Ipv6 Classifiers . Lets ignore this classifier and try the next one.

			break;

		}
@@ -221,8 +204,7 @@ USHORT IpVersion6(PMINI_ADAPTER Adapter, /**< Pointer to the driver control stru 
	            break;

        	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "\nIPv6 Protocol Matched");



		if((ucNextProtocolAboveIP == TCP_HEADER_TYPE) || (ucNextProtocolAboveIP == UDP_HEADER_TYPE))

		{

		if ((ucNextProtocolAboveIP == TCP_HEADER_TYPE) || (ucNextProtocolAboveIP == UDP_HEADER_TYPE)) {

			//Match Src Port

			BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "\nIPv6 Source Port:%x\n",ntohs(ushSrcPort));

			bClassificationSucceed=MatchSrcPort(pstClassifierRule,ntohs(ushSrcPort));
@@ -240,18 +222,13 @@ USHORT IpVersion6(PMINI_ADAPTER Adapter, /**< Pointer to the driver control stru 
		}

	} while (0);



	if(TRUE==bClassificationSucceed)

	{

	if (TRUE == bClassificationSucceed) {

		INT iMatchedSFQueueIndex = 0;

		iMatchedSFQueueIndex = SearchSfid(Adapter,pstClassifierRule->ulSFID);

		if(iMatchedSFQueueIndex >= NO_OF_QUEUES)

		{

		if(iMatchedSFQueueIndex >= NO_OF_QUEUES) {

			bClassificationSucceed = FALSE;

		}

		else

		{

			if(FALSE == Adapter->PackInfo[iMatchedSFQueueIndex].bActive)

			{

		} else {

			if (FALSE == Adapter->PackInfo[iMatchedSFQueueIndex].bActive) {

				bClassificationSucceed = FALSE;

			}

		}
@@ -280,13 +257,11 @@ static BOOLEAN MatchSrcIpv6Address(S_CLASSIFIER_RULE *pstClassifierRule,IPV6Head 




	//First Convert the Ip Address in the packet to Host Endian order

	for(uiIpv6AddIndex=0;uiIpv6AddIndex<uiIpv6AddrNoLongWords;uiIpv6AddIndex++)

	{

	for (uiIpv6AddIndex = 0; uiIpv6AddIndex<uiIpv6AddrNoLongWords; uiIpv6AddIndex++) {

		aulSrcIP[uiIpv6AddIndex]=ntohl(pstIpv6Header->ulSrcIpAddress[uiIpv6AddIndex]);

	}



	for(uiLoopIndex=0;uiLoopIndex<uiCountIPSrcAddresses;uiLoopIndex+=uiIpv6AddrNoLongWords)

	{

	for (uiLoopIndex = 0; uiLoopIndex<uiCountIPSrcAddresses; uiLoopIndex += uiIpv6AddrNoLongWords) {

		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "\n Src Ipv6 Address In Received Packet : \n ");

		DumpIpv6Address(aulSrcIP);

		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "\n Src Ipv6 Mask In Classifier Rule: \n");
@@ -294,17 +269,14 @@ static BOOLEAN MatchSrcIpv6Address(S_CLASSIFIER_RULE *pstClassifierRule,IPV6Head 
		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "\n Src Ipv6 Address In Classifier Rule : \n");

		DumpIpv6Address(&pstClassifierRule->stSrcIpAddress.ulIpv6Addr[uiLoopIndex]);



		for(uiIpv6AddIndex=0;uiIpv6AddIndex<uiIpv6AddrNoLongWords;uiIpv6AddIndex++)

		{

		for (uiIpv6AddIndex = 0; uiIpv6AddIndex < uiIpv6AddrNoLongWords; uiIpv6AddIndex++) {

			if ((pstClassifierRule->stSrcIpAddress.ulIpv6Mask[uiLoopIndex+uiIpv6AddIndex] & aulSrcIP[uiIpv6AddIndex])

				!= pstClassifierRule->stSrcIpAddress.ulIpv6Addr[uiLoopIndex+uiIpv6AddIndex])

			{

				!= pstClassifierRule->stSrcIpAddress.ulIpv6Addr[uiLoopIndex+uiIpv6AddIndex]) {

				//Match failed for current Ipv6 Address.Try next Ipv6 Address

				break;

			}



			if(uiIpv6AddIndex ==  uiIpv6AddrNoLongWords-1)

			{

			if (uiIpv6AddIndex ==  uiIpv6AddrNoLongWords-1) {

				//Match Found

				BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "Ipv6 Src Ip Address Matched\n");

				return TRUE;
@@ -333,13 +305,11 @@ static BOOLEAN MatchDestIpv6Address(S_CLASSIFIER_RULE *pstClassifierRule,IPV6Hea 




	//First Convert the Ip Address in the packet to Host Endian order

	for(uiIpv6AddIndex=0;uiIpv6AddIndex<uiIpv6AddrNoLongWords;uiIpv6AddIndex++)

	{

	for (uiIpv6AddIndex = 0;uiIpv6AddIndex < uiIpv6AddrNoLongWords; uiIpv6AddIndex++) {

		aulDestIP[uiIpv6AddIndex]=ntohl(pstIpv6Header->ulDestIpAddress[uiIpv6AddIndex]);

	}



	for(uiLoopIndex=0;uiLoopIndex<uiCountIPDestinationAddresses;uiLoopIndex+=uiIpv6AddrNoLongWords)

	{

	for (uiLoopIndex = 0;uiLoopIndex < uiCountIPDestinationAddresses; uiLoopIndex += uiIpv6AddrNoLongWords) {

		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "\n Destination Ipv6 Address In Received Packet : \n ");

		DumpIpv6Address(aulDestIP);

		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "\n Destination Ipv6 Mask In Classifier Rule: \n");
@@ -347,17 +317,14 @@ static BOOLEAN MatchDestIpv6Address(S_CLASSIFIER_RULE *pstClassifierRule,IPV6Hea 
		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "\n Destination Ipv6 Address In Classifier Rule : \n");

		DumpIpv6Address(&pstClassifierRule->stDestIpAddress.ulIpv6Addr[uiLoopIndex]);



		for(uiIpv6AddIndex=0;uiIpv6AddIndex<uiIpv6AddrNoLongWords;uiIpv6AddIndex++)

		{

		for (uiIpv6AddIndex = 0; uiIpv6AddIndex < uiIpv6AddrNoLongWords; uiIpv6AddIndex++) {

			if ((pstClassifierRule->stDestIpAddress.ulIpv6Mask[uiLoopIndex+uiIpv6AddIndex] & aulDestIP[uiIpv6AddIndex])

				!= pstClassifierRule->stDestIpAddress.ulIpv6Addr[uiLoopIndex+uiIpv6AddIndex])

			{

				!= pstClassifierRule->stDestIpAddress.ulIpv6Addr[uiLoopIndex+uiIpv6AddIndex]) {

				//Match failed for current Ipv6 Address.Try next Ipv6 Address

				break;

			}



			if(uiIpv6AddIndex ==  uiIpv6AddrNoLongWords-1)

			{

			if (uiIpv6AddIndex ==  uiIpv6AddrNoLongWords-1) {

				//Match Found

				BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "Ipv6 Destination Ip Address Matched\n");

				return TRUE;
@@ -373,8 +340,7 @@ VOID DumpIpv6Address(ULONG *puIpv6Address) 
	UINT uiIpv6AddrNoLongWords = 4;

	UINT uiIpv6AddIndex = 0;

	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);

	for(uiIpv6AddIndex=0;uiIpv6AddIndex<uiIpv6AddrNoLongWords;uiIpv6AddIndex++)

	{

	for (uiIpv6AddIndex = 0; uiIpv6AddIndex < uiIpv6AddrNoLongWords; uiIpv6AddIndex++) {

		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, ":%lx",puIpv6Address[uiIpv6AddIndex]);

	}