Update net/ to use sg helpers

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

diff --git a/net/core/dst.c b/net/core/dst.c
index 38c741ac5d08cae79a1742bd6a40269acf30df8f..16958e64e577f8c12723f02129a5f1e9b1791fdb 100644 (file)
--- a/net/core/dst.c
+++ b/net/core/dst.c
@@ -18,6 +18,7 @@
 #include <linux/types.h>
 #include <net/net_namespace.h>
 
+#include <net/net_namespace.h>
 #include <net/dst.h>
 
 /*
@@ -278,13 +279,13 @@ 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;
-               dev_hold(&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(&loopback_dev);
+                       dev_hold(dst->neighbour->dev);
                }
        }
 }