[PATCH 1/2] Staging: bcm: Add typedef back for bcm_ip_address, and convert struct back to union.

klmckinney1 at gmail.com klmckinney1 at gmail.com
Thu May 24 03:16:29 UTC 2012


From: Kevin McKinney <klmckinney1 at gmail.com>

This patch adds typedef back for bcm_ip_address
and convert the struct back to union. All calls
to the struct are changed to call the typedef.

Signed-off-by: Kevin McKinney <klmckinney1 at gmail.com>
---
 drivers/staging/bcm/Adapter.h |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index 5207c61..4ce3670 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -35,7 +35,7 @@ struct bcm_link_request {
 #define MAX_PROTOCOL_LENGTH   32
 #define IPV6_ADDRESS_SIZEINBYTES 0x10
 
-struct bcm_ip_address {
+typedef union _bcm_ip_address {
 	struct {
 		ULONG ulIpv4Addr[MAX_IP_RANGE_LENGTH]; /* Source Ip Address Range */
 		ULONG ulIpv4Mask[MAX_IP_RANGE_LENGTH]; /* Source Ip Mask Address Range */
@@ -52,7 +52,7 @@ struct bcm_ip_address {
 		UCHAR ucIpv6Address[MAX_IP_RANGE_LENGTH * IPV6_ADDRESS_SIZEINBYTES];
 		UCHAR ucIpv6Mask[MAX_IP_RANGE_LENGTH * IPV6_ADDRESS_SIZEINBYTES];
 	};
-};
+} bcm_ip_address;
 struct _packet_info;
 
 struct bcm_hdr_supression_contextinfo {
@@ -67,10 +67,10 @@ struct bcm_classifier_rule {
 	BOOLEAN		bUsed;
 	USHORT		usVCID_Value;
 	B_UINT8		u8ClassifierRulePriority; /* This field detemines the Classifier Priority */
-	struct bcm_ip_address stSrcIpAddress;
+	bcm_ip_address  stSrcIpAddress;
 	UCHAR		ucIPSourceAddressLength; /* Ip Source Address Length */
 
-	struct bcm_ip_address stDestIpAddress;
+	bcm_ip_address  stDestIpAddress;
 	UCHAR		ucIPDestinationAddressLength; /* Ip Destination Address Length */
 	UCHAR		ucIPTypeOfServiceLength; /* Type of service Length */
 	UCHAR		ucTosLow; /* Tos Low */
-- 
1.7.9.5




More information about the devel mailing list