Commit 0aaad65a authored by Kevin McKinney's avatar Kevin McKinney Committed by Greg Kroah-Hartman

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

This patch removes typedef for _U_MIBS_IP_ADDRESS, and
changes the name of the union to bcm_mibs_ip_addr.
In addition, any calls to typedef U_MIBS_IP_ADDRESS are
changed to call the union directly.
Signed-off-by: default avatarKevin McKinney <klmckinney1@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 86758b75
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#define MIBS_MAX_HIST_ENTRIES 12 #define MIBS_MAX_HIST_ENTRIES 12
#define MIBS_PKTSIZEHIST_RANGE 128 #define MIBS_PKTSIZEHIST_RANGE 128
typedef union _U_MIBS_IP_ADDRESS { union bcm_mibs_ip_addr {
struct { struct {
/* Source Ip Address Range */ /* Source Ip Address Range */
unsigned long ulIpv4Addr[MIBS_MAX_IP_RANGE_LENGTH]; unsigned long ulIpv4Addr[MIBS_MAX_IP_RANGE_LENGTH];
...@@ -41,7 +41,7 @@ typedef union _U_MIBS_IP_ADDRESS { ...@@ -41,7 +41,7 @@ typedef union _U_MIBS_IP_ADDRESS {
unsigned char ucIpv6Address[MIBS_MAX_IP_RANGE_LENGTH * MIBS_IPV6_ADDRESS_SIZEINBYTES]; unsigned char ucIpv6Address[MIBS_MAX_IP_RANGE_LENGTH * MIBS_IPV6_ADDRESS_SIZEINBYTES];
unsigned char ucIpv6Mask[MIBS_MAX_IP_RANGE_LENGTH * MIBS_IPV6_ADDRESS_SIZEINBYTES]; unsigned char ucIpv6Mask[MIBS_MAX_IP_RANGE_LENGTH * MIBS_IPV6_ADDRESS_SIZEINBYTES];
}; };
} U_MIBS_IP_ADDRESS; };
struct bcm_mibs_host_info { struct bcm_mibs_host_info {
u64 GoodTransmits; u64 GoodTransmits;
...@@ -71,10 +71,10 @@ struct bcm_mibs_classifier_rule { ...@@ -71,10 +71,10 @@ struct bcm_mibs_classifier_rule {
bool bUsed; bool bUsed;
unsigned short usVCID_Value; unsigned short usVCID_Value;
u8 u8ClassifierRulePriority; u8 u8ClassifierRulePriority;
U_MIBS_IP_ADDRESS stSrcIpAddress; union bcm_mibs_ip_addr stSrcIpAddress;
/* IP Source Address Length */ /* IP Source Address Length */
unsigned char ucIPSourceAddressLength; unsigned char ucIPSourceAddressLength;
U_MIBS_IP_ADDRESS stDestIpAddress; union bcm_mibs_ip_addr stDestIpAddress;
/* IP Destination Address Length */ /* IP Destination Address Length */
unsigned char ucIPDestinationAddressLength; unsigned char ucIPDestinationAddressLength;
unsigned char ucIPTypeOfServiceLength; unsigned char ucIPTypeOfServiceLength;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment