aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2006-08-15 02:55:20 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2006-09-22 17:54:40 -0400
commit2aa7f36cdb332a32849afbf25fcbf35dce5b1940 (patch)
treedcf6403b12dbd2b37148a6e8abca74b3ceb36019
parent50da859d4e566fba90ebda87b843970d902c903e (diff)
[DECNET]: cleanups
- make the following needlessly global functions static: - dn_fib.c: dn_fib_sync_down() - dn_fib.c: dn_fib_sync_up() - dn_rules.c: dn_fib_rule_action() - remove the following unneeded prototype: - dn_fib.c: dn_cache_dump() Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/net/dn_fib.h3
-rw-r--r--net/decnet/dn_fib.c9
-rw-r--r--net/decnet/dn_rules.c4
3 files changed, 7 insertions, 9 deletions
diff --git a/include/net/dn_fib.h b/include/net/dn_fib.h
index d97aa10c463f..f01626cbbed6 100644
--- a/include/net/dn_fib.h
+++ b/include/net/dn_fib.h
@@ -131,9 +131,6 @@ extern __le16 dn_fib_get_attr16(struct rtattr *attr, int attrlen, int type);
131extern void dn_fib_flush(void); 131extern void dn_fib_flush(void);
132extern void dn_fib_select_multipath(const struct flowi *fl, 132extern void dn_fib_select_multipath(const struct flowi *fl,
133 struct dn_fib_res *res); 133 struct dn_fib_res *res);
134extern int dn_fib_sync_down(__le16 local, struct net_device *dev,
135 int force);
136extern int dn_fib_sync_up(struct net_device *dev);
137 134
138/* 135/*
139 * dn_tables.c 136 * dn_tables.c
diff --git a/net/decnet/dn_fib.c b/net/decnet/dn_fib.c
index 5ccca3ed53bd..1cf010124ec5 100644
--- a/net/decnet/dn_fib.c
+++ b/net/decnet/dn_fib.c
@@ -55,8 +55,6 @@
55 55
56#define endfor_nexthops(fi) } 56#define endfor_nexthops(fi) }
57 57
58extern int dn_cache_dump(struct sk_buff *skb, struct netlink_callback *cb);
59
60static DEFINE_SPINLOCK(dn_fib_multipath_lock); 58static DEFINE_SPINLOCK(dn_fib_multipath_lock);
61static struct dn_fib_info *dn_fib_info_list; 59static struct dn_fib_info *dn_fib_info_list;
62static DEFINE_SPINLOCK(dn_fib_info_lock); 60static DEFINE_SPINLOCK(dn_fib_info_lock);
@@ -80,6 +78,9 @@ static struct
80 [RTN_XRESOLVE] = { .error = -EINVAL, .scope = RT_SCOPE_NOWHERE }, 78 [RTN_XRESOLVE] = { .error = -EINVAL, .scope = RT_SCOPE_NOWHERE },
81}; 79};
82 80
81static int dn_fib_sync_down(__le16 local, struct net_device *dev, int force);
82static int dn_fib_sync_up(struct net_device *dev);
83
83void dn_fib_free_info(struct dn_fib_info *fi) 84void dn_fib_free_info(struct dn_fib_info *fi)
84{ 85{
85 if (fi->fib_dead == 0) { 86 if (fi->fib_dead == 0) {
@@ -651,7 +652,7 @@ static int dn_fib_dnaddr_event(struct notifier_block *this, unsigned long event,
651 return NOTIFY_DONE; 652 return NOTIFY_DONE;
652} 653}
653 654
654int dn_fib_sync_down(__le16 local, struct net_device *dev, int force) 655static int dn_fib_sync_down(__le16 local, struct net_device *dev, int force)
655{ 656{
656 int ret = 0; 657 int ret = 0;
657 int scope = RT_SCOPE_NOWHERE; 658 int scope = RT_SCOPE_NOWHERE;
@@ -695,7 +696,7 @@ int dn_fib_sync_down(__le16 local, struct net_device *dev, int force)
695} 696}
696 697
697 698
698int dn_fib_sync_up(struct net_device *dev) 699static int dn_fib_sync_up(struct net_device *dev)
699{ 700{
700 int ret = 0; 701 int ret = 0;
701 702
diff --git a/net/decnet/dn_rules.c b/net/decnet/dn_rules.c
index 977bb56c3ce4..50e819edf8c7 100644
--- a/net/decnet/dn_rules.c
+++ b/net/decnet/dn_rules.c
@@ -75,8 +75,8 @@ int dn_fib_lookup(struct flowi *flp, struct dn_fib_res *res)
75 return err; 75 return err;
76} 76}
77 77
78int dn_fib_rule_action(struct fib_rule *rule, struct flowi *flp, int flags, 78static int dn_fib_rule_action(struct fib_rule *rule, struct flowi *flp,
79 struct fib_lookup_arg *arg) 79 int flags, struct fib_lookup_arg *arg)
80{ 80{
81 int err = -EAGAIN; 81 int err = -EAGAIN;
82 struct dn_fib_table *tbl; 82 struct dn_fib_table *tbl;