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

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



This patch removes typedef for _PHS_DEVICE_EXTENSION, and
changes the name of the struct to bcm_phs_extension. In
addition, any calls to struct "PHS_DEVICE_EXTENSION, or
*PPHS_DEVICE_EXTENSION;" are changed to call directly.

Signed-off-by: default avatarKevin McKinney <klmckinney1@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 86773aa9

drivers/staging/bcm/Adapter.h

+1 −1
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ struct bcm_mini_adapter { 
	/* BOOLEAN			bTriedToWakeUpFromShutdown; */

	BOOLEAN			bLinkDownRequested;

	int			downloadDDR;

	PHS_DEVICE_EXTENSION	stBCMPhsContext;

	struct bcm_phs_extension stBCMPhsContext;

	struct bcm_hdr_suppression_contextinfo stPhsTxContextInfo;

	uint8_t			ucaPHSPktRestoreBuf[2048];

	uint8_t			bPHSEnabled;

drivers/staging/bcm/PHSDefines.h

+2 −2
Original line number Diff line number Diff line
@@ -84,11 +84,11 @@ typedef struct _S_SERVICEFLOW_TABLE { 
	S_SERVICEFLOW_ENTRY stSFList[MAX_SERVICEFLOWS];

} S_SERVICEFLOW_TABLE;



typedef struct _PHS_DEVICE_EXTENSION {

struct bcm_phs_extension {

	/* PHS Specific data */

	S_SERVICEFLOW_TABLE *pstServiceFlowPhsRulesTable;

	void *CompressedTxBuffer;

	void *UnCompressedRxBuffer;

} PHS_DEVICE_EXTENSION, *PPHS_DEVICE_EXTENSION;

};



#endif

drivers/staging/bcm/PHSModule.c

+10 −10
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ void DumpFullPacket(UCHAR *pBuf,UINT nPktLen) 
// TRUE(1)	-If allocation of memory was success full.

// FALSE	-If allocation of memory fails.

//-----------------------------------------------------------------------------

int phs_init(PPHS_DEVICE_EXTENSION pPhsdeviceExtension, struct bcm_mini_adapter *Adapter)

int phs_init(struct bcm_phs_extension *pPhsdeviceExtension, struct bcm_mini_adapter *Adapter)

{

	int i;

	S_SERVICEFLOW_TABLE *pstServiceFlowTable;
@@ -351,7 +351,7 @@ int phs_init(PPHS_DEVICE_EXTENSION pPhsdeviceExtension, struct bcm_mini_adapter 
}





int PhsCleanup(IN PPHS_DEVICE_EXTENSION pPHSDeviceExt)

int PhsCleanup(IN struct bcm_phs_extension *pPHSDeviceExt)

{

	if(pPHSDeviceExt->pstServiceFlowPhsRulesTable)

	{
@@ -402,7 +402,7 @@ ULONG PhsUpdateClassifierRule(IN void* pvContext, 






	PPHS_DEVICE_EXTENSION pDeviceExtension= (PPHS_DEVICE_EXTENSION)pvContext;

	struct bcm_phs_extension *pDeviceExtension= (struct bcm_phs_extension *)pvContext;



	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL,"PHS With Corr2 Changes \n");
@@ -465,7 +465,7 @@ ULONG PhsDeletePHSRule(IN void* pvContext,IN B_UINT16 uiVcid,IN B_UINT8 u8PHSI) 
	struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);





	PPHS_DEVICE_EXTENSION pDeviceExtension= (PPHS_DEVICE_EXTENSION)pvContext;

	struct bcm_phs_extension *pDeviceExtension= (struct bcm_phs_extension *)pvContext;



	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL, "======>\n");
@@ -529,7 +529,7 @@ ULONG PhsDeleteClassifierRule(IN void* pvContext,IN B_UINT16 uiVcid ,IN B_UINT16 
	S_SERVICEFLOW_ENTRY *pstServiceFlowEntry = NULL;

	S_CLASSIFIER_ENTRY *pstClassifierEntry = NULL;

	struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);

	PPHS_DEVICE_EXTENSION pDeviceExtension= (PPHS_DEVICE_EXTENSION)pvContext;

	struct bcm_phs_extension *pDeviceExtension= (struct bcm_phs_extension *)pvContext;



	if(pDeviceExtension)

	{
@@ -593,7 +593,7 @@ ULONG PhsDeleteSFRules(IN void* pvContext,IN B_UINT16 uiVcid) 
	S_SERVICEFLOW_ENTRY *pstServiceFlowEntry = NULL;

	S_CLASSIFIER_TABLE *pstClassifierRulesTable = NULL;

	struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);

	PPHS_DEVICE_EXTENSION pDeviceExtension= (PPHS_DEVICE_EXTENSION)pvContext;

	struct bcm_phs_extension *pDeviceExtension= (struct bcm_phs_extension *)pvContext;

    BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL,"====> \n");



	if(pDeviceExtension)
@@ -688,7 +688,7 @@ ULONG PhsCompress(IN void* pvContext, 






	PPHS_DEVICE_EXTENSION pDeviceExtension= (PPHS_DEVICE_EXTENSION)pvContext;

	struct bcm_phs_extension *pDeviceExtension= (struct bcm_phs_extension *)pvContext;





	if(pDeviceExtension == NULL)
@@ -779,8 +779,8 @@ ULONG PhsDeCompress(IN void* pvContext, 
	S_PHS_RULE *pstPhsRule = NULL;

	UINT phsi;

	struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);

	PPHS_DEVICE_EXTENSION pDeviceExtension=

        (PPHS_DEVICE_EXTENSION)pvContext;

	struct bcm_phs_extension *pDeviceExtension=

        (struct bcm_phs_extension *)pvContext;



	*pInHeaderSize = 0;
@@ -1331,7 +1331,7 @@ static BOOLEAN DerefPhsRule(IN B_UINT16 uiClsId,S_CLASSIFIER_TABLE *psaClassifi 
	}

}



void DumpPhsRules(PPHS_DEVICE_EXTENSION pDeviceExtension)

void DumpPhsRules(struct bcm_phs_extension *pDeviceExtension)

{

	int i,j,k,l;

	struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);

drivers/staging/bcm/PHSModule.h

+4 −4
Original line number Diff line number Diff line
@@ -22,12 +22,12 @@ void DumpDataPacketHeader(PUCHAR pPkt); 


void DumpFullPacket(UCHAR *pBuf,UINT nPktLen);



void DumpPhsRules(PPHS_DEVICE_EXTENSION pDeviceExtension);

void DumpPhsRules(struct bcm_phs_extension *pDeviceExtension);





int phs_init(PPHS_DEVICE_EXTENSION pPhsdeviceExtension,struct bcm_mini_adapter *Adapter);

int phs_init(struct bcm_phs_extension *pPhsdeviceExtension,struct bcm_mini_adapter *Adapter);



int PhsCleanup(PPHS_DEVICE_EXTENSION pPHSDeviceExt);

int PhsCleanup(struct bcm_phs_extension *pPHSDeviceExt);



//Utility Functions

ULONG PhsUpdateClassifierRule(void* pvContext,B_UINT16 uiVcid,B_UINT16 uiClsId,S_PHS_RULE *psPhsRule,B_UINT8  u8AssociatedPHSI );
@@ -44,7 +44,7 @@ BOOLEAN ValidatePHSRule(S_PHS_RULE *psPhsRule); 
UINT GetServiceFlowEntry(S_SERVICEFLOW_TABLE *psServiceFlowTable,B_UINT16 uiVcid,S_SERVICEFLOW_ENTRY **ppstServiceFlowEntry);





void DumpPhsRules(PPHS_DEVICE_EXTENSION pDeviceExtension);

void DumpPhsRules(struct bcm_phs_extension *pDeviceExtension);





#endif

drivers/staging/bcm/hostmibs.c

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ INT ProcessGetHostMibs(struct bcm_mini_adapter *Adapter, struct bcm_host_stats_m 
	S_PHS_RULE *pstPhsRule = NULL;

	S_CLASSIFIER_TABLE *pstClassifierTable = NULL;

	S_CLASSIFIER_ENTRY *pstClassifierRule = NULL;

	PPHS_DEVICE_EXTENSION pDeviceExtension = (PPHS_DEVICE_EXTENSION) &Adapter->stBCMPhsContext;

	struct bcm_phs_extension *pDeviceExtension = (struct bcm_phs_extension *) &Adapter->stBCMPhsContext;



	UINT nClassifierIndex = 0, nPhsTableIndex = 0, nSfIndex = 0, uiIndex = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE