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

This patch removes typedef for _S_MIBS_EXTSERVICEFLOW_PARAMETERS,
and changes the name of the struct to bcm_mibs_parameters. In
addition, any calls to typedef S_MIBS_EXTSERVICEFLOW_PARAMETERS
are changed to call the struct directly.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index 15e88380da437f0ab8d51dcfd9334c4f0e959741..f57794827f730e135e3435fc76658d3f27581c20 100644 (file)
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -151,7 +151,7 @@ struct bcm_packet_info {
        UINT            NumOfPacketsSent;
        UCHAR           ucDirection;
        USHORT          usCID;
-       S_MIBS_EXTSERVICEFLOW_PARAMETERS        stMibsExtServiceFlowTable;
+       struct bcm_mibs_parameters stMibsExtServiceFlowTable;
        UINT            uiCurrentRxRate;
        UINT            uiThisPeriodRxBytes;
        UINT            uiTotalRxBytes;

diff --git a/drivers/staging/bcm/HostMIBSInterface.h b/drivers/staging/bcm/HostMIBSInterface.h
index 0698ce04e8fb307b7b0ce8b27eded03379f150b4..a09e3540fde2badfa9ce153a2d24bef299b31c33 100644 (file)
--- a/drivers/staging/bcm/HostMIBSInterface.h
+++ b/drivers/staging/bcm/HostMIBSInterface.h
@@ -113,7 +113,7 @@ typedef struct _S_MIBS_PHS_RULE {
        unsigned long   PHSErrorNumPackets;
 } S_MIBS_PHS_RULE;
 
-typedef struct _S_MIBS_EXTSERVICEFLOW_PARAMETERS {
+struct bcm_mibs_parameters {
        u32 wmanIfSfid;
        u32 wmanIfCmnCpsSfState;
        u32 wmanIfCmnCpsMaxSustainedRate;
@@ -135,7 +135,7 @@ typedef struct _S_MIBS_EXTSERVICEFLOW_PARAMETERS {
        u32 wmanIfCmnCpsReqTxPolicy;
        u32 wmanIfCmnSfCsSpecification;
        u32 wmanIfCmnCpsTargetSaid;
-} S_MIBS_EXTSERVICEFLOW_PARAMETERS;
+};
 
 struct bcm_mibs_table {
        unsigned long   ulSFID;
@@ -163,7 +163,7 @@ struct bcm_mibs_table {
        unsigned int    NumOfPacketsSent;
        unsigned char ucDirection;
        unsigned short  usCID;
-       S_MIBS_EXTSERVICEFLOW_PARAMETERS stMibsExtServiceFlowTable;
+       struct bcm_mibs_parameters stMibsExtServiceFlowTable;
        unsigned int    uiCurrentRxRate;
        unsigned int    uiThisPeriodRxBytes;
        unsigned int    uiTotalRxBytes;

diff --git a/drivers/staging/bcm/Misc.c b/drivers/staging/bcm/Misc.c
index 9e9a93627dd91ebb34ca884fa126cb9817c21e68..c92078e7fe86b321937823fbd0f46c8931eae6cd 100644 (file)
--- a/drivers/staging/bcm/Misc.c
+++ b/drivers/staging/bcm/Misc.c
@@ -1575,6 +1575,6 @@ static void beceem_protocol_reset(struct bcm_mini_adapter *Adapter)
        for (i = 0; i < HiPriority; i++) {
                /* resetting only the first size (S_MIBS_SERVICEFLOW_TABLE) for the SF. */
                /* It is same between MIBs and SF. */
-               memset(&Adapter->PackInfo[i].stMibsExtServiceFlowTable, 0, sizeof(S_MIBS_EXTSERVICEFLOW_PARAMETERS));
+               memset(&Adapter->PackInfo[i].stMibsExtServiceFlowTable, 0, sizeof(struct bcm_mibs_parameters));
        }
 }

diff --git a/drivers/staging/bcm/hostmibs.c b/drivers/staging/bcm/hostmibs.c
index 2fbe29c5433105f4a94f739d2231ad7f5b8ae697..051f223a82550fb5d0066c9e0f080fe024024f0e 100644 (file)
--- a/drivers/staging/bcm/hostmibs.c
+++ b/drivers/staging/bcm/hostmibs.c
@@ -103,7 +103,7 @@ VOID GetDroppedAppCntrlPktMibs(struct bcm_host_stats_mibs *pstHostMibs, struct b
 
 VOID CopyMIBSExtendedSFParameters(struct bcm_mini_adapter *Adapter, struct bcm_connect_mgr_params *psfLocalSet, UINT uiSearchRuleIndex)
 {
-       S_MIBS_EXTSERVICEFLOW_PARAMETERS *t = &Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable;
+       struct bcm_mibs_parameters *t = &Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable;
 
        t->wmanIfSfid = psfLocalSet->u32SFID;
        t->wmanIfCmnCpsMaxSustainedRate = psfLocalSet->u32MaxSustainedTrafficRate;