diff options
| author | Kevin McKinney <klmckinney1@gmail.com> | 2012-11-25 19:28:58 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-26 16:07:57 -0800 |
| commit | ba738b43e4d8f82aa17767f9d4707ac301720cbc (patch) | |
| tree | d3c92b8dc507402fc828f1ffd2f30d1f210aa3ef | |
| parent | 2790a3cc82b864faf924d703640a4f1dc61d8802 (diff) | |
| download | linux-ba738b43e4d8f82aa17767f9d4707ac301720cbc.tar.bz2 | |
Staging: bcm: Remove typedef for _S_MIBS_SERVICEFLOW_TABLE and call directly.
This patch removes typedef for _S_MIBS_SERVICEFLOW_TABLE,
and changes the name of the struct to bcm_mibs_table.
In addition, any calls to typedef S_MIBS_SERVICEFLOW_TABLE
are changed to call the struct directly.
Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/bcm/CmHost.c | 2 | ||||
| -rw-r--r-- | drivers/staging/bcm/HostMIBSInterface.h | 6 | ||||
| -rw-r--r-- | drivers/staging/bcm/hostmibs.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/bcm/CmHost.c b/drivers/staging/bcm/CmHost.c index 482e59592cd6..23ddc3d7c9ea 100644 --- a/drivers/staging/bcm/CmHost.c +++ b/drivers/staging/bcm/CmHost.c @@ -107,7 +107,7 @@ static VOID deleteSFBySfid(struct bcm_mini_adapter *Adapter, UINT uiSearchRuleIn DeleteAllClassifiersForSF(Adapter, uiSearchRuleIndex); /* Resetting only MIBS related entries in the SF */ - memset((PVOID)&Adapter->PackInfo[uiSearchRuleIndex], 0, sizeof(S_MIBS_SERVICEFLOW_TABLE)); + memset((PVOID)&Adapter->PackInfo[uiSearchRuleIndex], 0, sizeof(struct bcm_mibs_table)); } static inline VOID diff --git a/drivers/staging/bcm/HostMIBSInterface.h b/drivers/staging/bcm/HostMIBSInterface.h index e697b03e1510..0698ce04e8fb 100644 --- a/drivers/staging/bcm/HostMIBSInterface.h +++ b/drivers/staging/bcm/HostMIBSInterface.h @@ -137,7 +137,7 @@ typedef struct _S_MIBS_EXTSERVICEFLOW_PARAMETERS { u32 wmanIfCmnCpsTargetSaid; } S_MIBS_EXTSERVICEFLOW_PARAMETERS; -typedef struct _S_MIBS_SERVICEFLOW_TABLE { +struct bcm_mibs_table { unsigned long ulSFID; unsigned short usVCID_Value; unsigned int uiThreshold; @@ -168,7 +168,7 @@ typedef struct _S_MIBS_SERVICEFLOW_TABLE { unsigned int uiThisPeriodRxBytes; unsigned int uiTotalRxBytes; unsigned int uiTotalTxBytes; -} S_MIBS_SERVICEFLOW_TABLE; +}; struct bcm_mibs_dropped_cntrl_msg { unsigned long cm_responses; @@ -184,7 +184,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]; - S_MIBS_SERVICEFLOW_TABLE astSFtable[MIBS_MAX_SERVICEFLOWS]; + struct bcm_mibs_table astSFtable[MIBS_MAX_SERVICEFLOWS]; S_MIBS_PHS_RULE astPhsRulesTable[MIBS_MAX_PHSRULES]; struct bcm_mibs_dropped_cntrl_msg stDroppedAppCntrlMsgs; }; diff --git a/drivers/staging/bcm/hostmibs.c b/drivers/staging/bcm/hostmibs.c index e7dc39ea7ae6..2fbe29c54331 100644 --- a/drivers/staging/bcm/hostmibs.c +++ b/drivers/staging/bcm/hostmibs.c @@ -39,7 +39,7 @@ INT ProcessGetHostMibs(struct bcm_mini_adapter *Adapter, struct bcm_host_stats_m if (Adapter->PackInfo[nSfIndex].bValid) { memcpy((PVOID) & pstHostMibs->astSFtable[nSfIndex], (PVOID) & Adapter->PackInfo[nSfIndex], - sizeof(S_MIBS_SERVICEFLOW_TABLE)); + sizeof(struct bcm_mibs_table)); } else { /* If index in not valid, * don't process this for the PHS table. |