Staging: bcm: PHSModule.c: Matching the function definition with function declaration
Subsystems (2)
PATCH 1/1 Staging: bcm: PHSModule.c: Matching the function definition with function declaration
From: Shalin Mehta <[email protected]>
NOTE: Sending it again. I got mail delivery failure due to typo in emai ID [email protected]
The function implementations of the PHSModule didn't match with the declaration. The functions are static in the declaration but in the implemntation they are non-static
--- drivers/staging/bcm/PHSModule.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/staging/bcm/PHSModule.c +6 -6
@@ -596,7 +596,7 @@ ULONG PhsDeleteSFRules(IN void *pvContext, IN B_UINT16 uiVcid)* 0 if successful, * >0 Error. */ -ULONG PhsCompress(IN void *pvContext, +static ULONG PhsCompress(IN void *pvContext, IN B_UINT16 uiVcid, IN B_UINT16 uiClsId, IN void *pvInputBuffer,
@@ -677,7 +677,7 @@ ULONG PhsCompress(IN void *pvContext,* 0 if successful, * >0 Error. */ -ULONG PhsDeCompress(IN void *pvContext, +static ULONG PhsDeCompress(IN void *pvContext, IN B_UINT16 uiVcid, IN void *pvInputBuffer, OUT void *pvOutputBuffer,
@@ -829,7 +829,7 @@ UINT GetServiceFlowEntry(IN struct bcm_phs_table *psServiceFlowTable,return PHS_INVALID_TABLE_INDEX ; } -UINT GetClassifierEntry(IN struct bcm_phs_classifier_table *pstClassifierTable, +static UINT GetClassifierEntry(IN struct bcm_phs_classifier_table *pstClassifierTable, IN B_UINT32 uiClsid, enum bcm_phs_classifier_context eClsContext, OUT struct bcm_phs_classifier_entry **ppstClassifierEntry) {
@@ -880,7 +880,7 @@ static UINT GetPhsRuleEntry(IN struct bcm_phs_classifier_table *pstClassifierTabreturn PHS_INVALID_TABLE_INDEX ; } -UINT CreateSFToClassifierRuleMapping(IN B_UINT16 uiVcid, IN B_UINT16 uiClsId, +static UINT CreateSFToClassifierRuleMapping(IN B_UINT16 uiVcid, IN B_UINT16 uiClsId, IN struct bcm_phs_table *psServiceFlowTable,struct bcm_phs_rule *psPhsRule,B_UINT8 u8AssociatedPHSI)
@@ -913,7 +913,7 @@ UINT CreateSFToClassifierRuleMapping(IN B_UINT16 uiVcid, IN B_UINT16 uiClsId,return uiStatus; } -UINT CreateClassiferToPHSRuleMapping(IN B_UINT16 uiVcid, +static UINT CreateClassiferToPHSRuleMapping(IN B_UINT16 uiVcid, IN B_UINT16 uiClsId, IN struct bcm_phs_entry *pstServiceFlowEntry, struct bcm_phs_rule *psPhsRule,
@@ -1239,7 +1239,7 @@ void DumpPhsRules(struct bcm_phs_extension *pDeviceExtension)* header. * 0 -If PHS rule is NULL.If PHSI is 0 indicateing packet as uncompressed. */ -int phs_decompress (unsigned char *in_buf, +static int phs_decompress (unsigned char *in_buf,unsigned char *out_buf,struct bcm_phs_rule *decomp_phs_rules,UINT *header_size)
Signature · 1 line
1.8.1.2
Quoted 4 lines · Shalin Mehta
From: Shalin Mehta <[email protected]>
NOTE: Sending it again. I got mail delivery failure due to typo in emai ID [email protected]
Put these comments that don't belong in the changelog under the --- cut off line with the diffstat.
regards,
dan carpenter
Quoted 3 lines · Shalin Mehta
From: Shalin Mehta <[email protected]>
NOTE: Sending it again. I got mail delivery failure due to typo in emai ID [email protected]
I think that such a comment should go below the ---, since it doesn't have to be preserved in git.
julia
Quoted 76 lines
The function implementations of the PHSModule didn't match with the declaration. The functions are static in the declaration but in the implemntation they are non-static
Signed-off-by Shalin Mehta <[email protected]>--- drivers/staging/bcm/PHSModule.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)drivers/staging/bcm/PHSModule.c +6
-7@@ -596,7 +596,7 @@ ULONG PhsDeleteSFRules(IN void *pvContext, IN B_UINT16 uiVcid)* 0 if successful, * >0 Error. */ -ULONG PhsCompress(IN void *pvContext, +static ULONG PhsCompress(IN void *pvContext, IN B_UINT16 uiVcid, IN B_UINT16 uiClsId, IN void *pvInputBuffer,@@ -677,7 +677,7 @@ ULONG PhsCompress(IN void *pvContext,* 0 if successful, * >0 Error. */ -ULONG PhsDeCompress(IN void *pvContext, +static ULONG PhsDeCompress(IN void *pvContext, IN B_UINT16 uiVcid, IN void *pvInputBuffer, OUT void *pvOutputBuffer,@@ -829,7 +829,7 @@ UINT GetServiceFlowEntry(IN struct bcm_phs_table *psServiceFlowTable,return PHS_INVALID_TABLE_INDEX ; } -UINT GetClassifierEntry(IN struct bcm_phs_classifier_table *pstClassifierTable, +static UINT GetClassifierEntry(IN struct bcm_phs_classifier_table *pstClassifierTable, IN B_UINT32 uiClsid, enum bcm_phs_classifier_context eClsContext, OUT struct bcm_phs_classifier_entry **ppstClassifierEntry) {@@ -880,7 +880,7 @@ static UINT GetPhsRuleEntry(IN struct bcm_phs_classifier_table *pstClassifierTabreturn PHS_INVALID_TABLE_INDEX ; } -UINT CreateSFToClassifierRuleMapping(IN B_UINT16 uiVcid, IN B_UINT16 uiClsId, +static UINT CreateSFToClassifierRuleMapping(IN B_UINT16 uiVcid, IN B_UINT16 uiClsId, IN struct bcm_phs_table *psServiceFlowTable,struct bcm_phs_rule *psPhsRule,B_UINT8 u8AssociatedPHSI)@@ -913,7 +913,7 @@ UINT CreateSFToClassifierRuleMapping(IN B_UINT16 uiVcid, IN B_UINT16 uiClsId,return uiStatus; } -UINT CreateClassiferToPHSRuleMapping(IN B_UINT16 uiVcid, +static UINT CreateClassiferToPHSRuleMapping(IN B_UINT16 uiVcid, IN B_UINT16 uiClsId, IN struct bcm_phs_entry *pstServiceFlowEntry, struct bcm_phs_rule *psPhsRule,@@ -1239,7 +1239,7 @@ void DumpPhsRules(struct bcm_phs_extension *pDeviceExtension)* header. * 0 -If PHS rule is NULL.If PHSI is 0 indicateing packet as uncompressed. */ -int phs_decompress (unsigned char *in_buf, +static int phs_decompress (unsigned char *in_buf,unsigned char *out_buf,struct bcm_phs_rule *decomp_phs_rules,UINT *header_size) --1.8.1.2
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html