Skip to content

Commit da4d150

Browse files
Kevin McKinneygregkh
Kevin McKinney
authored and
gregkh
committed
Staging: bcm: Remove typedef for _S_SERVICEFLOW_TABLE and call directly.
This patch removes typedef for _S_SERVICEFLOW_TABLE, and changes the name of the struct to bcm_phs_table. In addition, any calls to struct "S_SERVICEFLOW_TABLE" are changed to call directly. Signed-off-by: Kevin McKinney <klmckinney1@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 60dadf9 commit da4d150

3 files changed

Lines changed: 11 additions & 11 deletions

File tree

‎drivers/staging/bcm/PHSDefines.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,14 @@ typedef struct _S_SERVICEFLOW_ENTRY {
7979
S_CLASSIFIER_TABLE *pstClassifierTable;
8080
} S_SERVICEFLOW_ENTRY;
8181

82-
typedef struct _S_SERVICEFLOW_TABLE {
82+
struct bcm_phs_table {
8383
u16 uiTotalServiceFlows;
8484
S_SERVICEFLOW_ENTRY stSFList[MAX_SERVICEFLOWS];
85-
} S_SERVICEFLOW_TABLE;
85+
};
8686

8787
struct bcm_phs_extension {
8888
/* PHS Specific data */
89-
S_SERVICEFLOW_TABLE *pstServiceFlowPhsRulesTable;
89+
struct bcm_phs_table *pstServiceFlowPhsRulesTable;
9090
void *CompressedTxBuffer;
9191
void *UnCompressedRxBuffer;
9292
};

‎drivers/staging/bcm/PHSModule.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "headers.h"
22

3-
static UINT CreateSFToClassifierRuleMapping(B_UINT16 uiVcid,B_UINT16 uiClsId,S_SERVICEFLOW_TABLE *psServiceFlowTable,S_PHS_RULE *psPhsRule,B_UINT8 u8AssociatedPHSI);
3+
static UINT CreateSFToClassifierRuleMapping(B_UINT16 uiVcid,B_UINT16 uiClsId, struct bcm_phs_table *psServiceFlowTable,S_PHS_RULE *psPhsRule,B_UINT8 u8AssociatedPHSI);
44

55
static UINT CreateClassiferToPHSRuleMapping(B_UINT16 uiVcid,B_UINT16 uiClsId,S_SERVICEFLOW_ENTRY *pstServiceFlowEntry,S_PHS_RULE *psPhsRule,B_UINT8 u8AssociatedPHSI);
66

@@ -16,7 +16,7 @@ static UINT GetClassifierEntry(S_CLASSIFIER_TABLE *pstClassifierTable,B_UINT32 u
1616

1717
static UINT GetPhsRuleEntry(S_CLASSIFIER_TABLE *pstClassifierTable,B_UINT32 uiPHSI,E_CLASSIFIER_ENTRY_CONTEXT eClsContext,S_PHS_RULE **ppstPhsRule);
1818

19-
static void free_phs_serviceflow_rules(S_SERVICEFLOW_TABLE *psServiceFlowRulesTable);
19+
static void free_phs_serviceflow_rules(struct bcm_phs_table *psServiceFlowRulesTable);
2020

2121
static int phs_compress(S_PHS_RULE *phs_members,unsigned char *in_buf,
2222
unsigned char *out_buf,unsigned int *header_size,UINT *new_header_size );
@@ -294,14 +294,14 @@ void DumpFullPacket(UCHAR *pBuf,UINT nPktLen)
294294
int phs_init(struct bcm_phs_extension *pPhsdeviceExtension, struct bcm_mini_adapter *Adapter)
295295
{
296296
int i;
297-
S_SERVICEFLOW_TABLE *pstServiceFlowTable;
297+
struct bcm_phs_table *pstServiceFlowTable;
298298
BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL, "\nPHS:phs_init function ");
299299

300300
if(pPhsdeviceExtension->pstServiceFlowPhsRulesTable)
301301
return -EINVAL;
302302

303303
pPhsdeviceExtension->pstServiceFlowPhsRulesTable =
304-
kzalloc(sizeof(S_SERVICEFLOW_TABLE), GFP_KERNEL);
304+
kzalloc(sizeof(struct bcm_phs_table), GFP_KERNEL);
305305

306306
if(!pPhsdeviceExtension->pstServiceFlowPhsRulesTable)
307307
{
@@ -844,7 +844,7 @@ ULONG PhsDeCompress(IN void* pvContext,
844844
// Does not return any value.
845845
//-----------------------------------------------------------------------------
846846

847-
static void free_phs_serviceflow_rules(S_SERVICEFLOW_TABLE *psServiceFlowRulesTable)
847+
static void free_phs_serviceflow_rules(struct bcm_phs_table *psServiceFlowRulesTable)
848848
{
849849
int i,j;
850850
struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
@@ -927,7 +927,7 @@ static BOOLEAN ValidatePHSRuleComplete(IN S_PHS_RULE *psPhsRule)
927927
}
928928
}
929929

930-
UINT GetServiceFlowEntry(IN S_SERVICEFLOW_TABLE *psServiceFlowTable,
930+
UINT GetServiceFlowEntry(IN struct bcm_phs_table *psServiceFlowTable,
931931
IN B_UINT16 uiVcid,S_SERVICEFLOW_ENTRY **ppstServiceFlowEntry)
932932
{
933933
int i;
@@ -1013,7 +1013,7 @@ static UINT GetPhsRuleEntry(IN S_CLASSIFIER_TABLE *pstClassifierTable,
10131013
}
10141014

10151015
UINT CreateSFToClassifierRuleMapping(IN B_UINT16 uiVcid,IN B_UINT16 uiClsId,
1016-
IN S_SERVICEFLOW_TABLE *psServiceFlowTable,S_PHS_RULE *psPhsRule,
1016+
IN struct bcm_phs_table *psServiceFlowTable,S_PHS_RULE *psPhsRule,
10171017
B_UINT8 u8AssociatedPHSI)
10181018
{
10191019

‎drivers/staging/bcm/PHSModule.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ ULONG PhsDeleteSFRules(void* pvContext,B_UINT16 uiVcid) ;
4141

4242
BOOLEAN ValidatePHSRule(S_PHS_RULE *psPhsRule);
4343

44-
UINT GetServiceFlowEntry(S_SERVICEFLOW_TABLE *psServiceFlowTable,B_UINT16 uiVcid,S_SERVICEFLOW_ENTRY **ppstServiceFlowEntry);
44+
UINT GetServiceFlowEntry(struct bcm_phs_table *psServiceFlowTable,B_UINT16 uiVcid,S_SERVICEFLOW_ENTRY **ppstServiceFlowEntry);
4545

4646

4747
void DumpPhsRules(struct bcm_phs_extension *pDeviceExtension);

0 commit comments

Comments
 (0)