From a184573db8ffba195838c6e65ba2a4c86e31c519 Mon Sep 17 00:00:00 2001 From: Hiroaki SHIMODA Date: Fri, 13 Apr 2012 07:34:44 +0000 Subject: [PATCH] --- yaml --- r: 300732 b: refs/heads/master c: dcd2ba92e842eec0d0372415fa26f1c411f5530d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/net/neighbour.h | 1 - trunk/net/core/neighbour.c | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index dc788367042d..4a0428cd8e9b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 447167bf565a474ff0cfb0f41d54936937479e97 +refs/heads/master: dcd2ba92e842eec0d0372415fa26f1c411f5530d diff --git a/trunk/include/net/neighbour.h b/trunk/include/net/neighbour.h index 34c996f46181..63ebd70ba693 100644 --- a/trunk/include/net/neighbour.h +++ b/trunk/include/net/neighbour.h @@ -195,7 +195,6 @@ static inline void *neighbour_priv(const struct neighbour *n) #define NEIGH_UPDATE_F_ADMIN 0x80000000 extern void neigh_table_init(struct neigh_table *tbl); -extern void neigh_table_init_no_netlink(struct neigh_table *tbl); extern int neigh_table_clear(struct neigh_table *tbl); extern struct neighbour * neigh_lookup(struct neigh_table *tbl, const void *pkey, diff --git a/trunk/net/core/neighbour.c b/trunk/net/core/neighbour.c index ac71765d6fd0..2d3e6fcdc9c9 100644 --- a/trunk/net/core/neighbour.c +++ b/trunk/net/core/neighbour.c @@ -1500,7 +1500,7 @@ static void neigh_parms_destroy(struct neigh_parms *parms) static struct lock_class_key neigh_table_proxy_queue_class; -void neigh_table_init_no_netlink(struct neigh_table *tbl) +static void neigh_table_init_no_netlink(struct neigh_table *tbl) { unsigned long now = jiffies; unsigned long phsize; @@ -1538,7 +1538,6 @@ void neigh_table_init_no_netlink(struct neigh_table *tbl) tbl->last_flush = now; tbl->last_rand = now + tbl->parms.reachable_time * 20; } -EXPORT_SYMBOL(neigh_table_init_no_netlink); void neigh_table_init(struct neigh_table *tbl) {