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

[firefly-linux-kernel-4.4.55.git] / net / core / rtnetlink.c

diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 606a6e8f3671defcc1eab21a471f0468f54f3359..5cf39cd7da85e85d7dc5e913a80735eb9acb2838 100644 (file)
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -2017,8 +2017,13 @@ static int rtnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
 
                __rtnl_unlock();
                rtnl = net->rtnl;
-               err = netlink_dump_start(rtnl, skb, nlh, dumpit,
-                                        NULL, min_dump_alloc);
+               {
+                       struct netlink_dump_control c = {
+                               .dump           = dumpit,
+                               .min_dump_alloc = min_dump_alloc,
+                       };
+                       err = netlink_dump_start(rtnl, skb, nlh, &c);
+               }
                rtnl_lock();
                return err;
        }