blackhole_netdev: use blackhole_netdev to invalidate dst entries

Use blackhole_netdev instead of 'lo' device with lower MTU when marking
dst "dead".

Signed-off-by: Mahesh Bandewar <[email protected]>
Tested-by: Michael Chan <[email protected]>
Signed-off-by: David S. Miller <[email protected]>

diff --git a/net/core/dst.c b/net/core/dst.c
index e46366228eaf7cef1fdca6ade5bff8d54e3c7416..1325316d9eababa5ebf970f266f1b80e67a27864 100644 (file)
--- a/net/core/dst.c
+++ b/net/core/dst.c
@@ -160,7 +160,7 @@ void dst_dev_put(struct dst_entry *dst)
                dst->ops->ifdown(dst, dev, true);
        dst->input = dst_discard;
        dst->output = dst_discard_out;
-       dst->dev = dev_net(dst->dev)->loopback_dev;
+       dst->dev = blackhole_netdev;
        dev_hold(dst->dev);
        dev_put(dev);
 }

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index bbd55c7f6b2e1f092cacda942dacacd557e4ae78..dc1f510a7c8135a11613ebf5d21e35403a1c27b6 100644 (file)
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -1532,7 +1532,6 @@ static void ipv4_dst_destroy(struct dst_entry *dst)
 
 void rt_flush_dev(struct net_device *dev)
 {
-       struct net *net = dev_net(dev);
        struct rtable *rt;
        int cpu;
 
@@ -1543,7 +1542,7 @@ void rt_flush_dev(struct net_device *dev)
                list_for_each_entry(rt, &ul->head, rt_uncached) {
                        if (rt->dst.dev != dev)
                                continue;
-                       rt->dst.dev = net->loopback_dev;
+                       rt->dst.dev = blackhole_netdev;
                        dev_hold(rt->dst.dev);
                        dev_put(dev);
                }

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 7556275b1cef902844a9c8a6345950ceec9e59de..39361f57351aaccbbbfc4169f95fc6569ef73846 100644 (file)
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -176,7 +176,7 @@ static void rt6_uncached_list_flush_dev(struct net *net, struct net_device *dev)
                        }
 
                        if (rt_dev == dev) {
-                               rt->dst.dev = loopback_dev;
+                               rt->dst.dev = blackhole_netdev;
                                dev_hold(rt->dst.dev);
                                dev_put(rt_dev);
                        }