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

[linux.git] / net / ipv4 / fib_notifier.c

diff --git a/net/ipv4/fib_notifier.c b/net/ipv4/fib_notifier.c
index b804ccbdb241e6a801ae29cf0664c6a23c0c8d48..0c28bd469a6810007ef66c6c224c6314aed56a6c 100644 (file)
--- a/net/ipv4/fib_notifier.c
+++ b/net/ipv4/fib_notifier.c
@@ -9,12 +9,12 @@
 #include <net/netns/ipv4.h>
 #include <net/ip_fib.h>
 
-int call_fib4_notifier(struct notifier_block *nb, struct net *net,
+int call_fib4_notifier(struct notifier_block *nb,
                       enum fib_event_type event_type,
                       struct fib_notifier_info *info)
 {
        info->family = AF_INET;
-       return call_fib_notifier(nb, net, event_type, info);
+       return call_fib_notifier(nb, event_type, info);
 }
 
 int call_fib4_notifiers(struct net *net, enum fib_event_type event_type,
@@ -34,17 +34,16 @@ static unsigned int fib4_seq_read(struct net *net)
        return net->ipv4.fib_seq + fib4_rules_seq_read(net);
 }
 
-static int fib4_dump(struct net *net, struct notifier_block *nb)
+static int fib4_dump(struct net *net, struct notifier_block *nb,
+                    struct netlink_ext_ack *extack)
 {
        int err;
 
-       err = fib4_rules_dump(net, nb);
+       err = fib4_rules_dump(net, nb, extack);
        if (err)
                return err;
 
-       fib_notify(net, nb);
-
-       return 0;
+       return fib_notify(net, nb, extack);
 }
 
 static const struct fib_notifier_ops fib4_notifier_ops_template = {