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 723bde501c648459ccf7bef70217492696252a51..4979af8b15599adcbc6309c902be3caa325b6e67 100644 (file)
--- a/include/net/arp.h
+++ b/include/net/arp.h
@@ -15,6 +15,29 @@ static inline u32 arp_hashfn(u32 key, const struct net_device *dev, u32 hash_rnd
        return val * hash_rnd;
 }
 
+static inline struct neighbour *__ipv4_neigh_lookup(struct neigh_table *tbl, struct net_device *dev, u32 key)
+{
+       struct neigh_hash_table *nht;
+       struct neighbour *n;
+       u32 hash_val;
+
+       rcu_read_lock_bh();
+       nht = rcu_dereference_bh(tbl->nht);
+       hash_val = arp_hashfn(key, dev, nht->hash_rnd) >> (32 - nht->hash_shift);
+       for (n = rcu_dereference_bh(nht->hash_buckets[hash_val]);
+            n != NULL;
+            n = rcu_dereference_bh(n->next)) {
+               if (n->dev == dev && *(u32 *)n->primary_key == key) {
+                       if (!atomic_inc_not_zero(&n->refcnt))
+                               n = NULL;
+                       break;
+               }
+       }
+       rcu_read_unlock_bh();
+
+       return n;
+}
+
 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);
@@ -22,7 +45,6 @@ extern void     arp_send(int type, int ptype, __be32 dest_ip,
                         struct net_device *dev, __be32 src_ip,
                         const unsigned char *dest_hw,
                         const unsigned char *src_hw, const unsigned char *th);
-extern int     arp_bind_neighbour(struct dst_entry *dst);
 extern int     arp_mc_map(__be32 addr, u8 *haddr, struct net_device *dev, int dir);
 extern void    arp_ifdown(struct net_device *dev);