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

Minor overlapping changes in net/ipv4/ipmr.c, in 'net' we were
fixing the "BH-ness" of the counter bumps whilst in 'net-next'
the functions were modified to take an explicit 'net' parameter.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 7 insertions, 6 deletions

diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index e786873c89f2..cc8f3e506cde 100644
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -1112,9 +1112,10 @@ static void nl_fib_lookup_exit(struct net *net)
         net->ipv4.fibnl = NULL;
 }
 
-static void fib_disable_ip(struct net_device *dev, unsigned long event)
+static void fib_disable_ip(struct net_device *dev, unsigned long event,
+                           bool force)
 {
-        if (fib_sync_down_dev(dev, event))
+        if (fib_sync_down_dev(dev, event, force))
                 fib_flush(dev_net(dev));
         rt_cache_flush(dev_net(dev));
         arp_ifdown(dev);
@@ -1142,7 +1143,7 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
                         /* Last address was deleted from this interface.
                          * Disable IP.
                          */
-                        fib_disable_ip(dev, event);
+                        fib_disable_ip(dev, event, true);
                 } else {
                         rt_cache_flush(dev_net(dev));
                 }
@@ -1159,7 +1160,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
         unsigned int flags;
 
         if (event == NETDEV_UNREGISTER) {
-                fib_disable_ip(dev, event);
+                fib_disable_ip(dev, event, true);
                 rt_flush_dev(dev);
                 return NOTIFY_DONE;
         }
@@ -1180,14 +1181,14 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
                 rt_cache_flush(net);
                 break;
         case NETDEV_DOWN:
-                fib_disable_ip(dev, event);
+                fib_disable_ip(dev, event, false);
                 break;
         case NETDEV_CHANGE:
                 flags = dev_get_flags(dev);
                 if (flags & (IFF_RUNNING | IFF_LOWER_UP))
                         fib_sync_up(dev, RTNH_F_LINKDOWN);
                 else
-                        fib_sync_down_dev(dev, event);
+                        fib_sync_down_dev(dev, event, false);
                 /* fall through */
         case NETDEV_CHANGEMTU:
                 rt_cache_flush(net);