Skip to content

L
linux
Commit efd2ee6d authored by Matthias Beyer's avatar Matthias Beyer Committed by Greg Kroah-Hartman
Browse files
Options

Staging: bcm: Outsourced PHS rule applying 

This patch outsources the big PHS-rule-applying code chunk into a
function.

It also replaces member accessing by using variables.
Signed-off-by: default avatarMatthias Beyer <mail@beyermatthias.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5c2c68d0
Hide whitespace changes
Inline Side-by-side
Showing with 99 additions and 71 deletions
drivers/staging/bcm/CmHost.c
View file @ efd2ee6d
...@@ -18,6 +18,14 @@ static void restore_endianess_of_pstClassifierEntry( ...@@ -18,6 +18,14 @@ static void restore_endianess_of_pstClassifierEntry(
struct bcm_classifier_rule *pstClassifierEntry, struct bcm_classifier_rule *pstClassifierEntry,
enum bcm_ipaddr_context eIpAddrContext); enum bcm_ipaddr_context eIpAddrContext);
static void apply_phs_rule_to_all_classifiers(
register struct bcm_mini_adapter *Adapter,
register UINT uiSearchRuleIndex,
USHORT uVCID,
struct bcm_phs_rule *sPhsRule,
struct bcm_phs_rules *cPhsRule,
struct bcm_add_indication_alt *pstAddIndication);
/************************************************************ /************************************************************
* Function - SearchSfid * Function - SearchSfid
* *
...@@ -627,79 +635,12 @@ static VOID CopyToAdapter(register struct bcm_mini_adapter *Adapter, /* <Pointer ...@@ -627,79 +635,12 @@ static VOID CopyToAdapter(register struct bcm_mini_adapter *Adapter, /* <Pointer
case eSetPHSRule: case eSetPHSRule:
if (psfCSType->cPhsRule.u8PHSI) { if (psfCSType->cPhsRule.u8PHSI) {
/* Apply This PHS Rule to all classifiers whose Associated PHSI Match */ /* Apply This PHS Rule to all classifiers whose Associated PHSI Match */
unsigned int uiClassifierIndex = 0; apply_phs_rule_to_all_classifiers(Adapter,
if (pstAddIndication->u8Direction == UPLINK_DIR) { uiSearchRuleIndex,
for (uiClassifierIndex = 0; uiClassifierIndex < MAX_CLASSIFIERS; uiClassifierIndex++) {
if ((Adapter->astClassifierTable[uiClassifierIndex].bUsed) &&
(Adapter->astClassifierTable[uiClassifierIndex].ulSFID == Adapter->PackInfo[uiSearchRuleIndex].ulSFID) &&
(Adapter->astClassifierTable[uiClassifierIndex].u8AssociatedPHSI == psfCSType->cPhsRule.u8PHSI)) {
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
"Adding PHS Rule For Classifier: 0x%x cPhsRule.u8PHSI: 0x%x\n",
Adapter->astClassifierTable[uiClassifierIndex].uiClassifierRuleIndex,
psfCSType->cPhsRule.u8PHSI);
/* Update The PHS Rule for this classifier as Associated PHSI id defined */
/* Copy the PHS Rule */
sPhsRule.u8PHSI = psfCSType->cPhsRule.u8PHSI;
sPhsRule.u8PHSFLength = psfCSType->cPhsRule.u8PHSFLength;
sPhsRule.u8PHSMLength = psfCSType->cPhsRule.u8PHSMLength;
sPhsRule.u8PHSS = psfCSType->cPhsRule.u8PHSS;
sPhsRule.u8PHSV = psfCSType->cPhsRule.u8PHSV;
memcpy(sPhsRule.u8PHSF, psfCSType->cPhsRule.u8PHSF, MAX_PHS_LENGTHS);
memcpy(sPhsRule.u8PHSM, psfCSType->cPhsRule.u8PHSM, MAX_PHS_LENGTHS);
sPhsRule.u8RefCnt = 0;
sPhsRule.bUnclassifiedPHSRule = false;
sPhsRule.PHSModifiedBytes = 0;
sPhsRule.PHSModifiedNumPackets = 0;
sPhsRule.PHSErrorNumPackets = 0;
/* bPHSRuleAssociated = TRUE; */
/* Store The PHS Rule for this classifier */
PhsUpdateClassifierRule(
&Adapter->stBCMPhsContext,
uVCID,
Adapter->astClassifierTable[uiClassifierIndex].uiClassifierRuleIndex,
&sPhsRule,
Adapter->astClassifierTable[uiClassifierIndex].u8AssociatedPHSI);
/* Update PHS Rule For the Classifier */
if (sPhsRule.u8PHSI) {
Adapter->astClassifierTable[uiClassifierIndex].u32PHSRuleID = sPhsRule.u8PHSI;
memcpy(&Adapter->astClassifierTable[uiClassifierIndex].sPhsRule, &sPhsRule, sizeof(struct bcm_phs_rule));
}
}
}
} else {
/* Error PHS Rule specified in signaling could not be applied to any classifier */
/* Copy the PHS Rule */
sPhsRule.u8PHSI = psfCSType->cPhsRule.u8PHSI;
sPhsRule.u8PHSFLength = psfCSType->cPhsRule.u8PHSFLength;
sPhsRule.u8PHSMLength = psfCSType->cPhsRule.u8PHSMLength;
sPhsRule.u8PHSS = psfCSType->cPhsRule.u8PHSS;
sPhsRule.u8PHSV = psfCSType->cPhsRule.u8PHSV;
memcpy(sPhsRule.u8PHSF, psfCSType->cPhsRule.u8PHSF, MAX_PHS_LENGTHS);
memcpy(sPhsRule.u8PHSM, psfCSType->cPhsRule.u8PHSM, MAX_PHS_LENGTHS);
sPhsRule.u8RefCnt = 0;
sPhsRule.bUnclassifiedPHSRule = TRUE;
sPhsRule.PHSModifiedBytes = 0;
sPhsRule.PHSModifiedNumPackets = 0;
sPhsRule.PHSErrorNumPackets = 0;
/* Store The PHS Rule for this classifier */
/*
* Passing the argument u8PHSI instead of clsid. Because for DL with no classifier rule,
* clsid will be zero hence we can't have multiple PHS rules for the same SF.
* To support multiple PHS rule, passing u8PHSI.
*/
PhsUpdateClassifierRule(
&Adapter->stBCMPhsContext,
uVCID, uVCID,
sPhsRule.u8PHSI,
&sPhsRule, &sPhsRule,
sPhsRule.u8PHSI); &psfCSType->cPhsRule,
} pstAddIndication);
} }
break; break;
} }
...@@ -2070,3 +2011,90 @@ static void restore_endianess_of_pstClassifierEntry( ...@@ -2070,3 +2011,90 @@ static void restore_endianess_of_pstClassifierEntry(
} }
} }
} }
static void apply_phs_rule_to_all_classifiers(
register struct bcm_mini_adapter *Adapter, /* <Pointer to the Adapter structure */
register UINT uiSearchRuleIndex, /* <Index of Queue, to which this data belongs */
USHORT uVCID,
struct bcm_phs_rule *sPhsRule,
struct bcm_phs_rules *cPhsRule,
struct bcm_add_indication_alt *pstAddIndication)
{
unsigned int uiClassifierIndex = 0;
struct bcm_classifier_rule *curr_classifier = NULL;
if (pstAddIndication->u8Direction == UPLINK_DIR) {
for (uiClassifierIndex = 0; uiClassifierIndex < MAX_CLASSIFIERS; uiClassifierIndex++) {
curr_classifier =
&Adapter->astClassifierTable[uiClassifierIndex];
if ((curr_classifier->bUsed) &&
(curr_classifier->ulSFID == Adapter->PackInfo[uiSearchRuleIndex].ulSFID) &&
(curr_classifier->u8AssociatedPHSI == cPhsRule->u8PHSI)) {
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,
"Adding PHS Rule For Classifier: 0x%x cPhsRule.u8PHSI: 0x%x\n",
curr_classifier->uiClassifierRuleIndex,
cPhsRule->u8PHSI);
/* Update The PHS Rule for this classifier as Associated PHSI id defined */
/* Copy the PHS Rule */
sPhsRule->u8PHSI = cPhsRule->u8PHSI;
sPhsRule->u8PHSFLength = cPhsRule->u8PHSFLength;
sPhsRule->u8PHSMLength = cPhsRule->u8PHSMLength;
sPhsRule->u8PHSS = cPhsRule->u8PHSS;
sPhsRule->u8PHSV = cPhsRule->u8PHSV;
memcpy(sPhsRule->u8PHSF, cPhsRule->u8PHSF, MAX_PHS_LENGTHS);
memcpy(sPhsRule->u8PHSM, cPhsRule->u8PHSM, MAX_PHS_LENGTHS);
sPhsRule->u8RefCnt = 0;
sPhsRule->bUnclassifiedPHSRule = false;
sPhsRule->PHSModifiedBytes = 0;
sPhsRule->PHSModifiedNumPackets = 0;
sPhsRule->PHSErrorNumPackets = 0;
/* bPHSRuleAssociated = TRUE; */
/* Store The PHS Rule for this classifier */
PhsUpdateClassifierRule(
&Adapter->stBCMPhsContext,
uVCID,
curr_classifier->uiClassifierRuleIndex,
sPhsRule,
curr_classifier->u8AssociatedPHSI);
/* Update PHS Rule For the Classifier */
if (sPhsRule->u8PHSI) {
curr_classifier->u32PHSRuleID = sPhsRule->u8PHSI;
memcpy(&curr_classifier->sPhsRule, sPhsRule, sizeof(struct bcm_phs_rule));
}
}
}
} else {
/* Error PHS Rule specified in signaling could not be applied to any classifier */
/* Copy the PHS Rule */
sPhsRule->u8PHSI = cPhsRule->u8PHSI;
sPhsRule->u8PHSFLength = cPhsRule->u8PHSFLength;
sPhsRule->u8PHSMLength = cPhsRule->u8PHSMLength;
sPhsRule->u8PHSS = cPhsRule->u8PHSS;
sPhsRule->u8PHSV = cPhsRule->u8PHSV;
memcpy(sPhsRule->u8PHSF, cPhsRule->u8PHSF, MAX_PHS_LENGTHS);
memcpy(sPhsRule->u8PHSM, cPhsRule->u8PHSM, MAX_PHS_LENGTHS);
sPhsRule->u8RefCnt = 0;
sPhsRule->bUnclassifiedPHSRule = TRUE;
sPhsRule->PHSModifiedBytes = 0;
sPhsRule->PHSModifiedNumPackets = 0;
sPhsRule->PHSErrorNumPackets = 0;
/* Store The PHS Rule for this classifier */
/*
* Passing the argument u8PHSI instead of clsid. Because for DL with no classifier rule,
* clsid will be zero hence we can't have multiple PHS rules for the same SF.
* To support multiple PHS rule, passing u8PHSI.
*/
PhsUpdateClassifierRule(
&Adapter->stBCMPhsContext,
uVCID,
sPhsRule->u8PHSI,
sPhsRule,
sPhsRule->u8PHSI);
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7