This patch removes typedef for _U_IP_ADDRESS, and
changes the name of the struct to bcm_ip_address. In
addition, any calls to struct "U_IP_ADDRESS" are
changed to call directly.

Signed-off-by: Kevin McKinney <klmckinn...@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 11fd7f1..33b5063 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
 
-typedef union _U_IP_ADDRESS {
+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 @@ typedef union _U_IP_ADDRESS {
                UCHAR ucIpv6Address[MAX_IP_RANGE_LENGTH * 
IPV6_ADDRESS_SIZEINBYTES];
                UCHAR ucIpv6Mask[MAX_IP_RANGE_LENGTH * 
IPV6_ADDRESS_SIZEINBYTES];
        };
-} U_IP_ADDRESS;
+};
 
 struct bcm_hdr_suppression_contextinfo {
        UCHAR ucaHdrSuppressionInBuf[MAX_PHS_LENGTHS]; /* Intermediate buffer 
to accumulate pkt Header for PHS */
@@ -66,10 +66,10 @@ struct bcm_classifier_rule {
        bool            bUsed;
        USHORT          usVCID_Value;
        B_UINT8         u8ClassifierRulePriority; /* This field detemines the 
Classifier Priority */
-       U_IP_ADDRESS    stSrcIpAddress;
+       union bcm_ip_address stSrcIpAddress;
        UCHAR           ucIPSourceAddressLength; /* Ip Source Address Length */
 
-       U_IP_ADDRESS    stDestIpAddress;
+       union bcm_ip_address stDestIpAddress;
        UCHAR           ucIPDestinationAddressLength; /* Ip Destination Address 
Length */
        UCHAR           ucIPTypeOfServiceLength; /* Type of service Length */
        UCHAR           ucTosLow; /* Tos Low */
-- 
1.7.9.5

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to