From dbffeecf25c7dedfe7180aeb1bc1d1da62a69a41 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Mon, 14 Aug 2006 23:55:20 -0700
Subject: [PATCH] --- yaml --- r: 34475 b: refs/heads/master c:
 2aa7f36cdb332a32849afbf25fcbf35dce5b1940 h: refs/heads/master i:   34473:
 4b506490bd34b44966c7a50d2fb1c9fe9a0c7647   34471:
 ca1f1c667a9d0fbe41a584e8cc042c2673b9744f v: v3

---
 [refs]                      | 2 +-
 trunk/include/net/dn_fib.h  | 3 ---
 trunk/net/decnet/dn_fib.c   | 9 +++++----
 trunk/net/decnet/dn_rules.c | 4 ++--
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 8f6c1fbd8b2a..e96617756d94 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 50da859d4e566fba90ebda87b843970d902c903e
+refs/heads/master: 2aa7f36cdb332a32849afbf25fcbf35dce5b1940
diff --git a/trunk/include/net/dn_fib.h b/trunk/include/net/dn_fib.h
index d97aa10c463f..f01626cbbed6 100644
--- a/trunk/include/net/dn_fib.h
+++ b/trunk/include/net/dn_fib.h
@@ -131,9 +131,6 @@ extern __le16 dn_fib_get_attr16(struct rtattr *attr, int attrlen, int type);
 extern void dn_fib_flush(void);
 extern void dn_fib_select_multipath(const struct flowi *fl,
 					struct dn_fib_res *res);
-extern int dn_fib_sync_down(__le16 local, struct net_device *dev,
-				int force);
-extern int dn_fib_sync_up(struct net_device *dev);
 
 /*
  * dn_tables.c
diff --git a/trunk/net/decnet/dn_fib.c b/trunk/net/decnet/dn_fib.c
index 5ccca3ed53bd..1cf010124ec5 100644
--- a/trunk/net/decnet/dn_fib.c
+++ b/trunk/net/decnet/dn_fib.c
@@ -55,8 +55,6 @@
 
 #define endfor_nexthops(fi) }
 
-extern int dn_cache_dump(struct sk_buff *skb, struct netlink_callback *cb);
-
 static DEFINE_SPINLOCK(dn_fib_multipath_lock);
 static struct dn_fib_info *dn_fib_info_list;
 static DEFINE_SPINLOCK(dn_fib_info_lock);
@@ -80,6 +78,9 @@ static struct
 	[RTN_XRESOLVE] =    { .error = -EINVAL, .scope = RT_SCOPE_NOWHERE },
 };
 
+static int dn_fib_sync_down(__le16 local, struct net_device *dev, int force);
+static int dn_fib_sync_up(struct net_device *dev);
+
 void dn_fib_free_info(struct dn_fib_info *fi)
 {
 	if (fi->fib_dead == 0) {
@@ -651,7 +652,7 @@ static int dn_fib_dnaddr_event(struct notifier_block *this, unsigned long event,
 	return NOTIFY_DONE;
 }
 
-int dn_fib_sync_down(__le16 local, struct net_device *dev, int force)
+static int dn_fib_sync_down(__le16 local, struct net_device *dev, int force)
 {
         int ret = 0;
         int scope = RT_SCOPE_NOWHERE;
@@ -695,7 +696,7 @@ int dn_fib_sync_down(__le16 local, struct net_device *dev, int force)
 }
 
 
-int dn_fib_sync_up(struct net_device *dev)
+static int dn_fib_sync_up(struct net_device *dev)
 {
         int ret = 0;
 
diff --git a/trunk/net/decnet/dn_rules.c b/trunk/net/decnet/dn_rules.c
index 977bb56c3ce4..50e819edf8c7 100644
--- a/trunk/net/decnet/dn_rules.c
+++ b/trunk/net/decnet/dn_rules.c
@@ -75,8 +75,8 @@ int dn_fib_lookup(struct flowi *flp, struct dn_fib_res *res)
 	return err;
 }
 
-int dn_fib_rule_action(struct fib_rule *rule, struct flowi *flp, int flags,
-		       struct fib_lookup_arg *arg)
+static int dn_fib_rule_action(struct fib_rule *rule, struct flowi *flp,
+			      int flags, struct fib_lookup_arg *arg)
 {
 	int err = -EAGAIN;
 	struct dn_fib_table *tbl;