[PATCH] use SK_MEM_QUANTUM_SHIFT in __sk_mem_reclaim()

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

diff --git a/net/core/dst.c b/net/core/dst.c
index 16958e64e577f8c12723f02129a5f1e9b1791fdb..7eceebaabaaaf79d589eb3e9f5478a4a98d0fa0f 100644 (file)
--- a/net/core/dst.c
+++ b/net/core/dst.c
@@ -18,7 +18,6 @@
 #include <linux/types.h>
 #include <net/net_namespace.h>
 
-#include <net/net_namespace.h>
 #include <net/dst.h>
 
 /*
@@ -154,11 +153,12 @@ loop:
 #endif
 }
 
-static int dst_discard(struct sk_buff *skb)
+int dst_discard(struct sk_buff *skb)
 {
        kfree_skb(skb);
        return 0;
 }
+EXPORT_SYMBOL(dst_discard);
 
 void * dst_alloc(struct dst_ops * ops)
 {
@@ -279,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 = init_net.loopback_dev;
+               dst->dev = dst->dev->nd_net->loopback_dev;
                dev_hold(dst->dev);
                dev_put(dev);
                if (dst->neighbour && dst->neighbour->dev == dev) {
-                       dst->neighbour->dev = init_net.loopback_dev;
+                       dst->neighbour->dev = dst->dev;
+                       dev_hold(dst->dev);
                        dev_put(dev);
-                       dev_hold(dst->neighbour->dev);
                }
        }
 }