From 295a514ba6e9af49278c91daf97fb2cee943560c Mon Sep 17 00:00:00 2001
From: Tobias Klauser <klto@zhaw.ch>
Date: Mon, 13 Jul 2009 11:17:49 -0700
Subject: [PATCH] --- yaml --- r: 158972 b: refs/heads/master c:
 97fd5bc7f2e442482a7a6cc4bc2a286cbb5f4754 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/net/core/neighbour.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 66a6ac4da387..d44783f48d6d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e321c4f72e2fb580a091317ba0fb2941f637ce1
+refs/heads/master: 97fd5bc7f2e442482a7a6cc4bc2a286cbb5f4754
diff --git a/trunk/net/core/neighbour.c b/trunk/net/core/neighbour.c
index 163b4f5b0365..c6f9ad8e4c7a 100644
--- a/trunk/net/core/neighbour.c
+++ b/trunk/net/core/neighbour.c
@@ -1316,7 +1316,7 @@ void pneigh_enqueue(struct neigh_table *tbl, struct neigh_parms *p,
 }
 EXPORT_SYMBOL(pneigh_enqueue);
 
-static inline struct neigh_parms *lookup_neigh_params(struct neigh_table *tbl,
+static inline struct neigh_parms *lookup_neigh_parms(struct neigh_table *tbl,
 						      struct net *net, int ifindex)
 {
 	struct neigh_parms *p;
@@ -1337,7 +1337,7 @@ struct neigh_parms *neigh_parms_alloc(struct net_device *dev,
 	struct net *net = dev_net(dev);
 	const struct net_device_ops *ops = dev->netdev_ops;
 
-	ref = lookup_neigh_params(tbl, net, 0);
+	ref = lookup_neigh_parms(tbl, net, 0);
 	if (!ref)
 		return NULL;
 
@@ -1906,7 +1906,7 @@ static int neightbl_set(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
 		if (tbp[NDTPA_IFINDEX])
 			ifindex = nla_get_u32(tbp[NDTPA_IFINDEX]);
 
-		p = lookup_neigh_params(tbl, net, ifindex);
+		p = lookup_neigh_parms(tbl, net, ifindex);
 		if (p == NULL) {
 			err = -ENOENT;
 			goto errout_tbl_lock;