Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 338183
b: refs/heads/master
c: af2bdce
h: refs/heads/master
i:
  338181: f2b3d16
  338179: ed724b8
  338175: ed0f449
v: v3
  • Loading branch information
Kevin McKinney authored and Greg Kroah-Hartman committed Nov 27, 2012
1 parent 43ed2f5 commit c214ca5
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 25 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2b9866f22bf655821808f15708d5cd2ca6f58ac3
refs/heads/master: af2bdceec5acfd3f364e57b70c5e01c73c9987fb
36 changes: 12 additions & 24 deletions trunk/drivers/staging/bcm/HostMIBSInterface.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,36 +20,30 @@
#define MIBS_MAX_HIST_ENTRIES 12
#define MIBS_PKTSIZEHIST_RANGE 128

typedef union _U_MIBS_IP_ADDRESS
{
struct
{
typedef union _U_MIBS_IP_ADDRESS {
struct {
/* Source Ip Address Range */
ULONG ulIpv4Addr[MIBS_MAX_IP_RANGE_LENGTH];
/* Source Ip Mask Address Range */
ULONG ulIpv4Mask[MIBS_MAX_IP_RANGE_LENGTH];
};
struct
{
struct {
/* Source Ip Address Range */
ULONG ulIpv6Addr[MIBS_MAX_IP_RANGE_LENGTH * 4];
/* Source Ip Mask Address Range */
ULONG ulIpv6Mask[MIBS_MAX_IP_RANGE_LENGTH * 4];
};
struct
{
struct {
UCHAR ucIpv4Address[MIBS_MAX_IP_RANGE_LENGTH * MIBS_IP_LENGTH_OF_ADDRESS];
UCHAR ucIpv4Mask[MIBS_MAX_IP_RANGE_LENGTH * MIBS_IP_LENGTH_OF_ADDRESS];
};
struct
{
struct {
UCHAR ucIpv6Address[MIBS_MAX_IP_RANGE_LENGTH * MIBS_IPV6_ADDRESS_SIZEINBYTES];
UCHAR ucIpv6Mask[MIBS_MAX_IP_RANGE_LENGTH * MIBS_IPV6_ADDRESS_SIZEINBYTES];
};
} U_MIBS_IP_ADDRESS;

typedef struct _S_MIBS_HOST_INFO
{
typedef struct _S_MIBS_HOST_INFO {
ULONG64 GoodTransmits;
ULONG64 GoodReceives;
/* this to keep track of the Tx and Rx MailBox Registers. */
Expand All @@ -70,8 +64,7 @@ typedef struct _S_MIBS_HOST_INFO
UINT32 aRxPktSizeHist[MIBS_MAX_HIST_ENTRIES];
} S_MIBS_HOST_INFO;

typedef struct _S_MIBS_CLASSIFIER_RULE
{
typedef struct _S_MIBS_CLASSIFIER_RULE {
ULONG ulSFID;
UCHAR ucReserved[2];
B_UINT16 uiClassifierRuleIndex;
Expand Down Expand Up @@ -105,8 +98,7 @@ typedef struct _S_MIBS_CLASSIFIER_RULE
UINT32 u32PHSRuleID;
} S_MIBS_CLASSIFIER_RULE;

typedef struct _S_MIBS_PHS_RULE
{
typedef struct _S_MIBS_PHS_RULE {
ULONG ulSFID;
B_UINT8 u8PHSI;
B_UINT8 u8PHSFLength;
Expand All @@ -121,8 +113,7 @@ typedef struct _S_MIBS_PHS_RULE
ULONG PHSErrorNumPackets;
} S_MIBS_PHS_RULE;

typedef struct _S_MIBS_EXTSERVICEFLOW_PARAMETERS
{
typedef struct _S_MIBS_EXTSERVICEFLOW_PARAMETERS {
UINT32 wmanIfSfid;
UINT32 wmanIfCmnCpsSfState;
UINT32 wmanIfCmnCpsMaxSustainedRate;
Expand All @@ -146,8 +137,7 @@ typedef struct _S_MIBS_EXTSERVICEFLOW_PARAMETERS
UINT32 wmanIfCmnCpsTargetSaid;
} S_MIBS_EXTSERVICEFLOW_PARAMETERS;

typedef struct _S_MIBS_SERVICEFLOW_TABLE
{
typedef struct _S_MIBS_SERVICEFLOW_TABLE {
ULONG ulSFID;
USHORT usVCID_Value;
UINT uiThreshold;
Expand Down Expand Up @@ -180,8 +170,7 @@ typedef struct _S_MIBS_SERVICEFLOW_TABLE
UINT uiTotalTxBytes;
} S_MIBS_SERVICEFLOW_TABLE;

typedef struct _S_MIBS_DROPPED_APP_CNTRL_MESSAGES
{
typedef struct _S_MIBS_DROPPED_APP_CNTRL_MESSAGES {
ULONG cm_responses;
ULONG cm_control_newdsx_multiclassifier_resp;
ULONG link_control_resp;
Expand All @@ -192,8 +181,7 @@ typedef struct _S_MIBS_DROPPED_APP_CNTRL_MESSAGES
ULONG low_priority_message;
} S_MIBS_DROPPED_APP_CNTRL_MESSAGES;

typedef struct _S_MIBS_HOST_STATS_MIBS
{
typedef struct _S_MIBS_HOST_STATS_MIBS {
S_MIBS_HOST_INFO stHostInfo;
S_MIBS_CLASSIFIER_RULE astClassifierTable[MIBS_MAX_CLASSIFIERS];
S_MIBS_SERVICEFLOW_TABLE astSFtable[MIBS_MAX_SERVICEFLOWS];
Expand Down

0 comments on commit c214ca5

Please sign in to comment.