Commit ba738b43 authored by Kevin McKinney's avatar Kevin McKinney Committed by Greg Kroah-Hartman
Browse files

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: default avatarKevin McKinney <klmckinney1@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2790a3cc

drivers/staging/bcm/CmHost.c

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/staging/bcm/HostMIBSInterface.h

+3 −3
Original line number Diff line number Diff line
@@ -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;

};

drivers/staging/bcm/hostmibs.c

+1 −1
Original line number Diff line number Diff line
@@ -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.

CRA Git | Maintained and supported by SUSTech CRA and CCSE