1 files changed, 14 insertions, 15 deletions

diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c
index 5abf7057af00..dd0761e3d280 100644
--- a/net/decnet/dn_route.c
+++ b/net/decnet/dn_route.c
@@ -55,7 +55,6 @@
     GNU General Public License for more details.
 *******************************************************************************/
 
-#include <linux/config.h>
 #include <linux/errno.h>
 #include <linux/types.h>
 #include <linux/socket.h>
@@ -81,6 +80,7 @@
 #include <net/neighbour.h>
 #include <net/dst.h>
 #include <net/flow.h>
+#include <net/fib_rules.h>
 #include <net/dn.h>
 #include <net/dn_dev.h>
 #include <net/dn_nsp.h>
@@ -926,8 +926,13 @@ static int dn_route_output_slow(struct dst_entry **pprt, const struct flowi *old
                 for(dev_out = dev_base; dev_out; dev_out = dev_out->next) {
                         if (!dev_out->dn_ptr)
                                 continue;
-                        if (dn_dev_islocal(dev_out, oldflp->fld_src))
-                                break;
+                        if (!dn_dev_islocal(dev_out, oldflp->fld_src))
+                                continue;
+                        if ((dev_out->flags & IFF_LOOPBACK) &&
+                            oldflp->fld_dst &&
+                            !dn_dev_islocal(dev_out, oldflp->fld_dst))
+                                continue;
+                        break;
                 }
                 read_unlock(&dev_base_lock);
                 if (dev_out == NULL)
@@ -1280,7 +1285,7 @@ static int dn_route_input_slow(struct sk_buff *skb)
                 dev_hold(out_dev);
 
                 if (res.r)
-                        src_map = dn_fib_rules_policy(fl.fld_src, &res, &flags);
+                        src_map = fl.fld_src; /* no NAT support for now */
 
                 gateway = DN_FIB_RES_GW(res);
                 if (res.type == RTN_NAT) {
@@ -1481,6 +1486,7 @@ static int dn_rt_fill_info(struct sk_buff *skb, u32 pid, u32 seq,
         r->rtm_src_len = 0;
         r->rtm_tos = 0;
         r->rtm_table = RT_TABLE_MAIN;
+        RTA_PUT_U32(skb, RTA_TABLE, RT_TABLE_MAIN);
         r->rtm_type = rt->rt_type;
         r->rtm_flags = (rt->rt_flags & ~0xFFFF) | RTM_F_CLONED;
         r->rtm_scope = RT_SCOPE_UNIVERSE;
@@ -1605,9 +1611,7 @@ int dn_cache_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh, void *arg)
                 goto out_free;
         }
 
-        err = netlink_unicast(rtnl, skb, NETLINK_CB(in_skb).pid, MSG_DONTWAIT);
-
-        return err;
+        return rtnl_unicast(skb, NETLINK_CB(in_skb).pid);
 
 out_free:
         kfree_skb(skb);
@@ -1777,14 +1781,9 @@ void __init dn_route_init(void)
 {
         int i, goal, order;
 
-        dn_dst_ops.kmem_cachep = kmem_cache_create("dn_dst_cache",
-                                                   sizeof(struct dn_route),
-                                                   0, SLAB_HWCACHE_ALIGN,
-                                                   NULL, NULL);
-
-        if (!dn_dst_ops.kmem_cachep)
-                panic("DECnet: Failed to allocate dn_dst_cache\n");
-
+        dn_dst_ops.kmem_cachep =
+                kmem_cache_create("dn_dst_cache", sizeof(struct dn_route), 0,
+                                  SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL);
         init_timer(&dn_route_timer);
         dn_route_timer.function = dn_dst_check_expire;
         dn_route_timer.expires = jiffies + decnet_dst_gc_interval * HZ;