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

[mirror_ubuntu-artful-kernel.git] / net / ipv6 / ip6mr.c

diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
index bf34d0950752ba1466fa806fd4f8ce0b802b0087..374997d26488ea38db7ed42ff7e6a55ede249021 100644 (file)
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
@@ -816,7 +816,7 @@ static int mif6_delete(struct mr6_table *mrt, int vifi, int notify,
        in6_dev = __in6_dev_get(dev);
        if (in6_dev) {
                in6_dev->cnf.mc_forwarding--;
-               inet6_netconf_notify_devconf(dev_net(dev),
+               inet6_netconf_notify_devconf(dev_net(dev), RTM_NEWNETCONF,
                                             NETCONFA_MC_FORWARDING,
                                             dev->ifindex, &in6_dev->cnf);
        }
@@ -975,7 +975,7 @@ static int mif6_add(struct net *net, struct mr6_table *mrt,
        in6_dev = __in6_dev_get(dev);
        if (in6_dev) {
                in6_dev->cnf.mc_forwarding++;
-               inet6_netconf_notify_devconf(dev_net(dev),
+               inet6_netconf_notify_devconf(dev_net(dev), RTM_NEWNETCONF,
                                             NETCONFA_MC_FORWARDING,
                                             dev->ifindex, &in6_dev->cnf);
        }
@@ -1598,7 +1598,8 @@ static int ip6mr_sk_init(struct mr6_table *mrt, struct sock *sk)
        write_unlock_bh(&mrt_lock);
 
        if (!err)
-               inet6_netconf_notify_devconf(net, NETCONFA_MC_FORWARDING,
+               inet6_netconf_notify_devconf(net, RTM_NEWNETCONF,
+                                            NETCONFA_MC_FORWARDING,
                                             NETCONFA_IFINDEX_ALL,
                                             net->ipv6.devconf_all);
        rtnl_unlock();
@@ -1619,7 +1620,7 @@ int ip6mr_sk_done(struct sock *sk)
                        mrt->mroute6_sk = NULL;
                        net->ipv6.devconf_all->mc_forwarding--;
                        write_unlock_bh(&mrt_lock);
-                       inet6_netconf_notify_devconf(net,
+                       inet6_netconf_notify_devconf(net, RTM_NEWNETCONF,
                                                     NETCONFA_MC_FORWARDING,
                                                     NETCONFA_IFINDEX_ALL,
                                                     net->ipv6.devconf_all);