rocker: Use logical operators on booleans
Silences various sparse warnings
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: Scott Feldman <sfeldma@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c
index 30687bf..fded127 100644
--- a/drivers/net/ethernet/rocker/rocker.c
+++ b/drivers/net/ethernet/rocker/rocker.c
@@ -2404,17 +2404,17 @@
}
priority = ROCKER_PRIORITY_UNKNOWN;
- if (vlan_bridging & dflt & wild)
+ if (vlan_bridging && dflt && wild)
priority = ROCKER_PRIORITY_BRIDGING_VLAN_DFLT_WILD;
- else if (vlan_bridging & dflt & !wild)
+ else if (vlan_bridging && dflt && !wild)
priority = ROCKER_PRIORITY_BRIDGING_VLAN_DFLT_EXACT;
- else if (vlan_bridging & !dflt)
+ else if (vlan_bridging && !dflt)
priority = ROCKER_PRIORITY_BRIDGING_VLAN;
- else if (!vlan_bridging & dflt & wild)
+ else if (!vlan_bridging && dflt && wild)
priority = ROCKER_PRIORITY_BRIDGING_TENANT_DFLT_WILD;
- else if (!vlan_bridging & dflt & !wild)
+ else if (!vlan_bridging && dflt && !wild)
priority = ROCKER_PRIORITY_BRIDGING_TENANT_DFLT_EXACT;
- else if (!vlan_bridging & !dflt)
+ else if (!vlan_bridging && !dflt)
priority = ROCKER_PRIORITY_BRIDGING_TENANT;
entry->key.priority = priority;
@@ -3010,9 +3010,9 @@
bool removing = (lw->flags & ROCKER_OP_FLAG_REMOVE);
bool learned = (lw->flags & ROCKER_OP_FLAG_LEARNED);
- if (learned & removing)
+ if (learned && removing)
br_fdb_external_learn_del(lw->dev, lw->addr, lw->vid);
- else if (learned & !removing)
+ else if (learned && !removing)
br_fdb_external_learn_add(lw->dev, lw->addr, lw->vid);
kfree(work);