| Message ID | 1417084826-9875-22-git-send-email-jiri@resnulli.us |
|---|---|
| State | Superseded, archived |
| Delegated to: | David Miller |
| Headers | show |
Signed-off-by: Scott Feldman <sfeldma@gmail.com> On Thu, Nov 27, 2014 at 12:40 AM, Jiri Pirko <jiri@resnulli.us> wrote: > From: Thomas Graf <tgraf@suug.ch> > > Silences various sparse warnings > > Signed-off-by: Thomas Graf <tgraf@suug.ch> > Signed-off-by: Jiri Pirko <jiri@resnulli.us> > --- > new in v4 > --- > drivers/net/ethernet/rocker/rocker.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > 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 @@ 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); > -- > 1.9.3 > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 @@ 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);