Pull battery into release branch

[linux-2.6] / net / core / dst.c

diff --git a/net/core/dst.c b/net/core/dst.c
index ad5ffa19d8097430e1c527961ad5a3508e996b7b..03daead3592ad0ef60628e85eef11e18da28b610 100644 (file)
--- a/net/core/dst.c
+++ b/net/core/dst.c
@@ -278,11 +278,11 @@ static inline void dst_ifdown(struct dst_entry *dst, struct net_device *dev,
        if (!unregister) {
                dst->input = dst->output = dst_discard;
        } else {
-               dst->dev = loopback_dev;
+               dst->dev = init_net.loopback_dev;
                dev_hold(dst->dev);
                dev_put(dev);
                if (dst->neighbour && dst->neighbour->dev == dev) {
-                       dst->neighbour->dev = loopback_dev;
+                       dst->neighbour->dev = init_net.loopback_dev;
                        dev_put(dev);
                        dev_hold(dst->neighbour->dev);
                }