Merge branch 'for-4.9-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...

[cascardo/linux.git] / net / bridge / br_fdb.c

diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index cd620fa..6b43c8c 100644 (file)
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -710,24 +710,27 @@ int br_fdb_dump(struct sk_buff *skb,
                struct netlink_callback *cb,
                struct net_device *dev,
                struct net_device *filter_dev,
-               int idx)
+               int *idx)
 {
        struct net_bridge *br = netdev_priv(dev);
+       int err = 0;
        int i;
 
        if (!(dev->priv_flags & IFF_EBRIDGE))
                goto out;
 
-       if (!filter_dev)
-               idx = ndo_dflt_fdb_dump(skb, cb, dev, NULL, idx);
+       if (!filter_dev) {
+               err = ndo_dflt_fdb_dump(skb, cb, dev, NULL, idx);
+               if (err < 0)
+                       goto out;
+       }
 
        for (i = 0; i < BR_HASH_SIZE; i++) {
                struct net_bridge_fdb_entry *f;
 
                hlist_for_each_entry_rcu(f, &br->hash[i], hlist) {
-                       int err;
 
-                       if (idx < cb->args[0])
+                       if (*idx < cb->args[2])
                                goto skip;
 
                        if (filter_dev &&
@@ -750,17 +753,15 @@ int br_fdb_dump(struct sk_buff *skb,
                                            cb->nlh->nlmsg_seq,
                                            RTM_NEWNEIGH,
                                            NLM_F_MULTI);
-                       if (err < 0) {
-                               cb->args[1] = err;
-                               break;
-                       }
+                       if (err < 0)
+                               goto out;
 skip:
-                       ++idx;
+                       *idx += 1;
                }
        }
 
 out:
-       return idx;
+       return err;
 }
 
 /* Update (create or replace) forwarding database entry */