Commit 9d4cf71f authored by Kevin McKinney's avatar Kevin McKinney Committed by Greg Kroah-Hartman
Browse files

Staging: bcm: Remove typedef for IPV6HeaderFormatTag and call directly. 



This patch removes typedef IPV6HeaderFormatTag,
and changes the name of the struct to bcm_ipv6_hdr.
In addition, any calls to typedef IPV6Header
are changed to call the struct directly.

Signed-off-by: default avatarKevin McKinney <klmckinney1@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8f0652c2

drivers/staging/bcm/IPv6Protocol.c

+9 −9
Original line number Diff line number Diff line 
#include "headers.h"



static BOOLEAN MatchSrcIpv6Address(struct bcm_classifier_rule *pstClassifierRule,

	IPV6Header *pstIpv6Header);

	struct bcm_ipv6_hdr *pstIpv6Header);

static BOOLEAN MatchDestIpv6Address(struct bcm_classifier_rule *pstClassifierRule,

	IPV6Header *pstIpv6Header);

static VOID DumpIpv6Header(IPV6Header *pstIpv6Header);

	struct bcm_ipv6_hdr *pstIpv6Header);

static VOID DumpIpv6Header(struct bcm_ipv6_hdr *pstIpv6Header);



static UCHAR *GetNextIPV6ChainedHeader(UCHAR **ppucPayload,

	UCHAR *pucNextHeader, BOOLEAN *bParseDone, USHORT *pusPayloadLength)
@@ -186,13 +186,13 @@ USHORT IpVersion6(struct bcm_mini_adapter *Adapter, PVOID pcIpHeader, 
	USHORT	ushDestPort = 0;

	USHORT	ushSrcPort = 0;

	UCHAR   ucNextProtocolAboveIP = 0;

	IPV6Header *pstIpv6Header = NULL;

	struct bcm_ipv6_hdr *pstIpv6Header = NULL;

	BOOLEAN bClassificationSucceed = FALSE;



	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV6_DBG,

			DBG_LVL_ALL, "IpVersion6 ==========>\n");



	pstIpv6Header = (IPV6Header *)pcIpHeader;

	pstIpv6Header = (struct bcm_ipv6_hdr *)pcIpHeader;



	DumpIpv6Header(pstIpv6Header);
@@ -200,7 +200,7 @@ USHORT IpVersion6(struct bcm_mini_adapter *Adapter, PVOID pcIpHeader, 
	 * Try to get the next higher layer protocol

	 * and the Ports Nos if TCP or UDP

	 */

	ucNextProtocolAboveIP = GetIpv6ProtocolPorts((UCHAR *)(pcIpHeader + sizeof(IPV6Header)),

	ucNextProtocolAboveIP = GetIpv6ProtocolPorts((UCHAR *)(pcIpHeader + sizeof(struct bcm_ipv6_hdr)),

							&ushSrcPort,

							&ushDestPort,

							pstIpv6Header->usPayloadLength,
@@ -289,7 +289,7 @@ USHORT IpVersion6(struct bcm_mini_adapter *Adapter, PVOID pcIpHeader, 




static BOOLEAN MatchSrcIpv6Address(struct bcm_classifier_rule *pstClassifierRule,

	IPV6Header *pstIpv6Header)

	struct bcm_ipv6_hdr *pstIpv6Header)

{

	UINT uiLoopIndex = 0;

	UINT uiIpv6AddIndex = 0;
@@ -345,7 +345,7 @@ static BOOLEAN MatchSrcIpv6Address(struct bcm_classifier_rule *pstClassifierRule 
}



static BOOLEAN MatchDestIpv6Address(struct bcm_classifier_rule *pstClassifierRule,

	IPV6Header *pstIpv6Header)

	struct bcm_ipv6_hdr *pstIpv6Header)

{

	UINT uiLoopIndex = 0;

	UINT uiIpv6AddIndex = 0;
@@ -414,7 +414,7 @@ VOID DumpIpv6Address(ULONG *puIpv6Address) 


}



static VOID DumpIpv6Header(IPV6Header *pstIpv6Header)

static VOID DumpIpv6Header(struct bcm_ipv6_hdr *pstIpv6Header)

{

	UCHAR ucVersion;

	UCHAR ucPrio;

drivers/staging/bcm/IPv6ProtocolHdr.h

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
 */

#define IPV6_DESTOPTS_HDR_OPTIONSIZE 0x8



typedef struct IPV6HeaderFormatTag {

struct bcm_ipv6_hdr {

	unsigned char  ucVersionPrio;

	unsigned char  aucFlowLabel[3];

	unsigned short usPayloadLength;
@@ -29,7 +29,7 @@ typedef struct IPV6HeaderFormatTag { 
	unsigned char  ucHopLimit;

	unsigned long  ulSrcIpAddress[4];

	unsigned long  ulDestIpAddress[4];

} IPV6Header;

};



struct bcm_ipv6_routing_hdr {

	unsigned char ucNextHeader;

CRA Git | Maintained and supported by SUSTech CRA and CCSE