summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2014-07-15 07:43:11 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-15 15:09:49 (GMT)
commit1c53f0877e874e4713e73342e51f8f3543fd59f9 (patch)
treeef87573da075a910cca2558a904e83c40e7f049b
parentc842dd2ddb888d64ad50387d36f93a5225cb0a9b (diff)
downloadlinux-1c53f0877e874e4713e73342e51f8f3543fd59f9.tar.xz
Staging: bcm: PHSModule.c: Simplified nested if statements by linking them with logical AND in GetServiceFlowEntry()
Signed-off-by: Matthias Beyer <mail@beyermatthias.de> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/bcm/PHSModule.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/staging/bcm/PHSModule.c b/drivers/staging/bcm/PHSModule.c
index 5eec706..4074eb8 100644
--- a/drivers/staging/bcm/PHSModule.c
+++ b/drivers/staging/bcm/PHSModule.c
@@ -990,11 +990,10 @@ static UINT GetClassifierEntry(IN struct bcm_phs_classifier_table *pstClassifier
psClassifierRules =
&pstClassifierTable->stOldPhsRulesList[i];
- if (psClassifierRules->bUsed) {
- if (psClassifierRules->uiClassifierRuleId == uiClsid) {
- *ppstClassifierEntry = psClassifierRules;
- return i;
- }
+ if (psClassifierRules->bUsed &&
+ (psClassifierRules->uiClassifierRuleId == uiClsid)) {
+ *ppstClassifierEntry = psClassifierRules;
+ return i;
}
}