Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 5 insertions, 7 deletions

diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index 08bf04bdac58..e0670d7054f9 100644
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -846,10 +846,9 @@ int br_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
                 /* VID was specified, so use it. */
                 err = __br_fdb_add(ndm, p, addr, nlh_flags, vid);
         } else {
-                if (!pv || bitmap_empty(pv->vlan_bitmap, VLAN_N_VID)) {
-                        err = __br_fdb_add(ndm, p, addr, nlh_flags, 0);
+                err = __br_fdb_add(ndm, p, addr, nlh_flags, 0);
+                if (err || !pv)
                         goto out;
-                }
 
                 /* We have vlans configured on this port and user didn't
                  * specify a VLAN.  To be nice, add/update entry for every
@@ -917,16 +916,15 @@ int br_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[],
 
                 err = __br_fdb_delete(p, addr, vid);
         } else {
-                if (!pv || bitmap_empty(pv->vlan_bitmap, VLAN_N_VID)) {
-                        err = __br_fdb_delete(p, addr, 0);
+                err = -ENOENT;
+                err &= __br_fdb_delete(p, addr, 0);
+                if (!pv)
                         goto out;
-                }
 
                 /* We have vlans configured on this port and user didn't
                  * specify a VLAN.  To be nice, add/update entry for every
                  * vlan on this port.
                  */
-                err = -ENOENT;
                 for_each_set_bit(vid, pv->vlan_bitmap, VLAN_N_VID) {
                         err &= __br_fdb_delete(p, addr, vid);
                 }