atm: clip: Use device neigh support on top of "arp_tbl".

Instead of instantiating an entire new neigh_table instance
just for ATM handling, use the neigh device private facility.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 8 deletions

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index fb47c8f0cd86..9a20663d5969 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -108,7 +108,6 @@
 #ifdef CONFIG_SYSCTL
 #include <linux/sysctl.h>
 #endif
-#include <net/atmclip.h>
 #include <net/secure_seq.h>
 
 #define RT_FL_TOS(oldflp4) \
@@ -1013,23 +1012,18 @@ static int slow_chain_length(const struct rtable *head)
 
 static struct neighbour *ipv4_neigh_lookup(const struct dst_entry *dst, const void *daddr)
 {
-        struct neigh_table *tbl = &arp_tbl;
         static const __be32 inaddr_any = 0;
         struct net_device *dev = dst->dev;
         const __be32 *pkey = daddr;
         struct neighbour *n;
 
-#if defined(CONFIG_ATM_CLIP) || defined(CONFIG_ATM_CLIP_MODULE)
-        if (dev->type == ARPHRD_ATM)
-                tbl = clip_tbl_hook;
-#endif
         if (dev->flags & (IFF_LOOPBACK | IFF_POINTOPOINT))
                 pkey = &inaddr_any;
 
-        n = __ipv4_neigh_lookup(tbl, dev, *(__force u32 *)pkey);
+        n = __ipv4_neigh_lookup(&arp_tbl, dev, *(__force u32 *)pkey);
         if (n)
                 return n;
-        return neigh_create(tbl, pkey, dev);
+        return neigh_create(&arp_tbl, pkey, dev);
 }
 
 static int rt_bind_neighbour(struct rtable *rt)