Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / net / bridge / br_netlink.c

diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index 881d7d1a732a884faa01873922364ca9a23862b7..06abb6634f5be777a374c389b1d4778cb79ee210 100644 (file)
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -117,12 +117,13 @@ static int br_dump_ifinfo(struct sk_buff *skb, struct netlink_callback *cb)
                        continue;
 
                if (idx < s_idx)
-                       continue;
+                       goto cont;
 
                err = br_fill_ifinfo(skb, p, NETLINK_CB(cb->skb).pid,
                                     cb->nlh->nlmsg_seq, RTM_NEWLINK, NLM_F_MULTI);
                if (err <= 0)
                        break;
+cont:
                ++idx;
        }
        read_unlock(&dev_base_lock);