Skip to content

Commit

Permalink
Staging: bcm: Remove typedef for IPV6HeaderFormatTag and call directly.
Browse files Browse the repository at this point in the history
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: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Kevin McKinney authored and Greg Kroah-Hartman committed Jan 7, 2013
1 parent 8f0652c commit 9d4cf71
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
18 changes: 9 additions & 9 deletions drivers/staging/bcm/IPv6Protocol.c
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#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)
Expand Down Expand Up @@ -186,21 +186,21 @@ 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);

/*
* 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,
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/bcm/IPv6ProtocolHdr.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
*/
#define IPV6_DESTOPTS_HDR_OPTIONSIZE 0x8

typedef struct IPV6HeaderFormatTag {
struct bcm_ipv6_hdr {
unsigned char ucVersionPrio;
unsigned char aucFlowLabel[3];
unsigned short usPayloadLength;
unsigned char ucNextHeader;
unsigned char ucHopLimit;
unsigned long ulSrcIpAddress[4];
unsigned long ulDestIpAddress[4];
} IPV6Header;
};

struct bcm_ipv6_routing_hdr {
unsigned char ucNextHeader;
Expand Down

0 comments on commit 9d4cf71

Please sign in to comment.