diff --git a/[refs] b/[refs] index f7a431ec3663..df9c73899369 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8a885ae80573430f1d3c31b6b33d078b1ed44aee +refs/heads/master: 4aca284f1a0d0b86a0105558a2599937ee32a5b7 diff --git a/trunk/drivers/staging/bcm/HostMIBSInterface.h b/trunk/drivers/staging/bcm/HostMIBSInterface.h index 97d8ee5fa5fb..d803ff12f568 100644 --- a/trunk/drivers/staging/bcm/HostMIBSInterface.h +++ b/trunk/drivers/staging/bcm/HostMIBSInterface.h @@ -64,7 +64,7 @@ typedef struct _S_MIBS_HOST_INFO { u32 aRxPktSizeHist[MIBS_MAX_HIST_ENTRIES]; } S_MIBS_HOST_INFO; -typedef struct _S_MIBS_CLASSIFIER_RULE { +struct bcm_mibs_classifier_rule { unsigned long ulSFID; unsigned char ucReserved[2]; u16 uiClassifierRuleIndex; @@ -96,7 +96,7 @@ typedef struct _S_MIBS_CLASSIFIER_RULE { unsigned char ucDirection; bool bIpv6Protocol; u32 u32PHSRuleID; -} S_MIBS_CLASSIFIER_RULE; +}; struct bcm_mibs_phs_rule { unsigned long ulSFID; @@ -183,7 +183,7 @@ struct bcm_mibs_dropped_cntrl_msg { struct bcm_host_stats_mibs { S_MIBS_HOST_INFO stHostInfo; - S_MIBS_CLASSIFIER_RULE astClassifierTable[MIBS_MAX_CLASSIFIERS]; + struct bcm_mibs_classifier_rule astClassifierTable[MIBS_MAX_CLASSIFIERS]; struct bcm_mibs_table astSFtable[MIBS_MAX_SERVICEFLOWS]; struct bcm_mibs_phs_rule astPhsRulesTable[MIBS_MAX_PHSRULES]; struct bcm_mibs_dropped_cntrl_msg stDroppedAppCntrlMsgs; diff --git a/trunk/drivers/staging/bcm/hostmibs.c b/trunk/drivers/staging/bcm/hostmibs.c index 051f223a8255..3c5f4a5f0376 100644 --- a/trunk/drivers/staging/bcm/hostmibs.c +++ b/trunk/drivers/staging/bcm/hostmibs.c @@ -31,7 +31,7 @@ INT ProcessGetHostMibs(struct bcm_mini_adapter *Adapter, struct bcm_host_stats_m astClassifierTable[nClassifierIndex], (PVOID) & Adapter-> astClassifierTable[nClassifierIndex], - sizeof(S_MIBS_CLASSIFIER_RULE)); + sizeof(struct bcm_mibs_classifier_rule)); } /* Copy the SF Table */