aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin McKinney <klmckinney1@gmail.com>2012-12-10 21:55:06 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-07 10:49:02 -0800
commitbc25b751537e9481bf41d2718969f9356e31fb4f (patch)
treee8e662c75dc31e3baf669151a681a5a75c210dbb
parent5601bb9da56602a4faa387c9cc6b1bb929393de5 (diff)
Staging: bcm: Remove typedef for IPV6HopByHopOptionsHeaderFormatTag and call directly.
This patch removes typedef IPV6HopByHopOptionsHeaderFormatTag, and changes the name of the struct to bcm_ipv6_options_hdr. In addition, any calls to typedef IPV6HopByHopOptionsHeader are changed to call the struct directly. Signed-off-by: Kevin McKinney <klmckinney1@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/bcm/IPv6Protocol.c2
-rw-r--r--drivers/staging/bcm/IPv6ProtocolHdr.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/bcm/IPv6Protocol.c b/drivers/staging/bcm/IPv6Protocol.c
index f3ab390518c..723fe4b2d54 100644
--- a/drivers/staging/bcm/IPv6Protocol.c
+++ b/drivers/staging/bcm/IPv6Protocol.c
@@ -38,7 +38,7 @@ static UCHAR *GetNextIPV6ChainedHeader(UCHAR **ppucPayload,
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV6_DBG,
DBG_LVL_ALL, "\nIPv6 HopByHop Header");
- usNextHeaderOffset += sizeof(IPV6HopByHopOptionsHeader);
+ usNextHeaderOffset += sizeof(struct bcm_ipv6_options_hdr);
}
break;
diff --git a/drivers/staging/bcm/IPv6ProtocolHdr.h b/drivers/staging/bcm/IPv6ProtocolHdr.h
index 1c49119cc47..f53c536cf53 100644
--- a/drivers/staging/bcm/IPv6ProtocolHdr.h
+++ b/drivers/staging/bcm/IPv6ProtocolHdr.h
@@ -52,11 +52,11 @@ typedef struct IPV6DestOptionsHeaderFormatTag {
unsigned char ucDestOptions[6];
} IPV6DestOptionsHeader;
-typedef struct IPV6HopByHopOptionsHeaderFormatTag {
+struct bcm_ipv6_options_hdr {
unsigned char ucNextHeader;
unsigned char ucMisc[3];
unsigned long ulJumboPayloadLen;
-} IPV6HopByHopOptionsHeader;
+};
struct bcm_ipv6_authentication_hdr {
unsigned char ucNextHeader;