Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1...

[~andy/linux] / include / net / arp.h

diff --git a/include/net/arp.h b/include/net/arp.h
index 5e669e6ffb4298f68f69935d4aa93a06f28e7901..4979af8b15599adcbc6309c902be3caa325b6e67 100644 (file)
--- a/include/net/arp.h
+++ b/include/net/arp.h
@@ -38,15 +38,6 @@ static inline struct neighbour *__ipv4_neigh_lookup(struct neigh_table *tbl, str
        return n;
 }
 
-static inline struct neighbour *ipv4_neigh_lookup(struct neigh_table *tbl, struct net_device *dev, const __be32 *pkey)
-{
-       struct neighbour *n = __ipv4_neigh_lookup(tbl, dev,
-                                                 *(__force u32 *)pkey);
-       if (n)
-               return n;
-       return neigh_create(tbl, pkey, dev);
-}
-
 extern void    arp_init(void);
 extern int     arp_find(unsigned char *haddr, struct sk_buff *skb);
 extern int     arp_ioctl(struct net *net, unsigned int cmd, void __user *arg);