diff options
| author | Thomas Graf <tgraf@suug.ch> | 2014-11-28 16:34:32 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-12-03 07:01:27 +0300 |
| commit | 51ace887a0c08cc431f99d46ab63c6b316052640 (patch) | |
| tree | c7c7e47bcf3fc9aa499308308840abe6f4f3327b /drivers/net/ethernet/rocker | |
| parent | e75605822e3190a1bd7935599e93f13ab1ba7c9d (diff) | |
| download | linux-51ace887a0c08cc431f99d46ab63c6b316052640.tar.xz | |
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>
Diffstat (limited to 'drivers/net/ethernet/rocker')
| -rw-r--r-- | drivers/net/ethernet/rocker/rocker.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c index 30687bf1143f..fded12784f22 100644 --- a/drivers/net/ethernet/rocker/rocker.c +++ b/drivers/net/ethernet/rocker/rocker.c @@ -2404,17 +2404,17 @@ static int rocker_flow_tbl_bridge(struct rocker_port *rocker_port, } 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 @@ static void rocker_port_fdb_learn_work(struct work_struct *work) 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); |