Skip to content

Commit 51ace88

Browse files
tgrafdavem330
authored andcommitted
rocker: Use logical operators on booleans
Silences various sparse warnings Signed-off-by: Thomas Graf <[email protected]> Signed-off-by: Jiri Pirko <[email protected]> Signed-off-by: Scott Feldman <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent e756058 commit 51ace88

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

drivers/net/ethernet/rocker/rocker.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2404,17 +2404,17 @@ static int rocker_flow_tbl_bridge(struct rocker_port *rocker_port,
24042404
}
24052405

24062406
priority = ROCKER_PRIORITY_UNKNOWN;
2407-
if (vlan_bridging & dflt & wild)
2407+
if (vlan_bridging && dflt && wild)
24082408
priority = ROCKER_PRIORITY_BRIDGING_VLAN_DFLT_WILD;
2409-
else if (vlan_bridging & dflt & !wild)
2409+
else if (vlan_bridging && dflt && !wild)
24102410
priority = ROCKER_PRIORITY_BRIDGING_VLAN_DFLT_EXACT;
2411-
else if (vlan_bridging & !dflt)
2411+
else if (vlan_bridging && !dflt)
24122412
priority = ROCKER_PRIORITY_BRIDGING_VLAN;
2413-
else if (!vlan_bridging & dflt & wild)
2413+
else if (!vlan_bridging && dflt && wild)
24142414
priority = ROCKER_PRIORITY_BRIDGING_TENANT_DFLT_WILD;
2415-
else if (!vlan_bridging & dflt & !wild)
2415+
else if (!vlan_bridging && dflt && !wild)
24162416
priority = ROCKER_PRIORITY_BRIDGING_TENANT_DFLT_EXACT;
2417-
else if (!vlan_bridging & !dflt)
2417+
else if (!vlan_bridging && !dflt)
24182418
priority = ROCKER_PRIORITY_BRIDGING_TENANT;
24192419

24202420
entry->key.priority = priority;
@@ -3010,9 +3010,9 @@ static void rocker_port_fdb_learn_work(struct work_struct *work)
30103010
bool removing = (lw->flags & ROCKER_OP_FLAG_REMOVE);
30113011
bool learned = (lw->flags & ROCKER_OP_FLAG_LEARNED);
30123012

3013-
if (learned & removing)
3013+
if (learned && removing)
30143014
br_fdb_external_learn_del(lw->dev, lw->addr, lw->vid);
3015-
else if (learned & !removing)
3015+
else if (learned && !removing)
30163016
br_fdb_external_learn_add(lw->dev, lw->addr, lw->vid);
30173017

30183018
kfree(work);

0 commit comments

Comments
 (0)