2 files changed, 9 insertions, 3 deletions

diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index cc36e59db7d7..e6e0372bc3cd 100644
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -686,6 +686,9 @@ int br_fdb_dump(struct sk_buff *skb,
         if (!(dev->priv_flags & IFF_EBRIDGE))
                 goto out;
 
+        if (!filter_dev)
+                idx = ndo_dflt_fdb_dump(skb, cb, dev, NULL, idx);
+
         for (i = 0; i < BR_HASH_SIZE; i++) {
                 struct net_bridge_fdb_entry *f;
 
@@ -697,7 +700,7 @@ int br_fdb_dump(struct sk_buff *skb,
                             (!f->dst || f->dst->dev != filter_dev)) {
                                 if (filter_dev != dev)
                                         goto skip;
-                                /* !f->dst is a speacial case for bridge
+                                /* !f->dst is a special case for bridge
                                  * It means the MAC belongs to the bridge
                                  * Therefore need a little more filtering
                                  * we only want to dump the !f->dst case
@@ -705,6 +708,8 @@ int br_fdb_dump(struct sk_buff *skb,
                                 if (f->dst)
                                         goto skip;
                         }
+                        if (!filter_dev && f->dst)
+                                goto skip;
 
                         if (fdb_fill_info(skb, br, f,
                                           NETLINK_CB(cb->skb).portid,
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 9cf6fe9ddc0c..da983d4bac02 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -2698,10 +2698,11 @@ static int rtnl_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb)
                                                          idx);
                 }
 
-                idx = ndo_dflt_fdb_dump(skb, cb, dev, NULL, idx);
                 if (dev->netdev_ops->ndo_fdb_dump)
-                        idx = dev->netdev_ops->ndo_fdb_dump(skb, cb, bdev, dev,
+                        idx = dev->netdev_ops->ndo_fdb_dump(skb, cb, dev, NULL,
                                                             idx);
+                else
+                        idx = ndo_dflt_fdb_dump(skb, cb, dev, NULL, idx);
 
                 cops = NULL;
         }