aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2006-08-08 00:50:48 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2006-09-22 17:54:07 -0400
commit8ce11e6a9faf1f1c849b77104adc1642c46aee95 (patch)
tree58b169b6856d5eafb8cbc1fa547ff967be9ad30c /net
parente6242e928ef1e4ed853f909a7479e4934f4bcb70 (diff)
[NET]: Make code static.
This patch makes needlessly global code static. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/cipso_ipv4.c2
-rw-r--r--net/ipv4/fib_rules.c4
-rw-r--r--net/ipv6/fib6_rules.c4
-rw-r--r--net/ipv6/ip6_fib.c6
-rw-r--r--net/ipv6/route.c6
-rw-r--r--net/netlabel/netlabel_domainhash.c4
6 files changed, 13 insertions, 13 deletions
diff --git a/net/ipv4/cipso_ipv4.c b/net/ipv4/cipso_ipv4.c
index b82a101c95c5..80a2a0911b49 100644
--- a/net/ipv4/cipso_ipv4.c
+++ b/net/ipv4/cipso_ipv4.c
@@ -60,7 +60,7 @@ struct cipso_v4_domhsh_entry {
60 * if in practice there are a lot of different DOIs this list should 60 * if in practice there are a lot of different DOIs this list should
61 * probably be turned into a hash table or something similar so we 61 * probably be turned into a hash table or something similar so we
62 * can do quick lookups. */ 62 * can do quick lookups. */
63DEFINE_SPINLOCK(cipso_v4_doi_list_lock); 63static DEFINE_SPINLOCK(cipso_v4_doi_list_lock);
64static struct list_head cipso_v4_doi_list = LIST_HEAD_INIT(cipso_v4_doi_list); 64static struct list_head cipso_v4_doi_list = LIST_HEAD_INIT(cipso_v4_doi_list);
65 65
66/* Label mapping cache */ 66/* Label mapping cache */
diff --git a/net/ipv4/fib_rules.c b/net/ipv4/fib_rules.c
index 23ec6ae1a0f6..03d1e8a43a48 100644
--- a/net/ipv4/fib_rules.c
+++ b/net/ipv4/fib_rules.c
@@ -101,8 +101,8 @@ int fib_lookup(struct flowi *flp, struct fib_result *res)
101 return err; 101 return err;
102} 102}
103 103
104int fib4_rule_action(struct fib_rule *rule, struct flowi *flp, int flags, 104static int fib4_rule_action(struct fib_rule *rule, struct flowi *flp,
105 struct fib_lookup_arg *arg) 105 int flags, struct fib_lookup_arg *arg)
106{ 106{
107 int err = -EAGAIN; 107 int err = -EAGAIN;
108 struct fib_table *tbl; 108 struct fib_table *tbl;
diff --git a/net/ipv6/fib6_rules.c b/net/ipv6/fib6_rules.c
index 94a46ec967a4..bf9bba83b852 100644
--- a/net/ipv6/fib6_rules.c
+++ b/net/ipv6/fib6_rules.c
@@ -66,8 +66,8 @@ struct dst_entry *fib6_rule_lookup(struct flowi *fl, int flags,
66 return (struct dst_entry *) arg.result; 66 return (struct dst_entry *) arg.result;
67} 67}
68 68
69int fib6_rule_action(struct fib_rule *rule, struct flowi *flp, 69static int fib6_rule_action(struct fib_rule *rule, struct flowi *flp,
70 int flags, struct fib_lookup_arg *arg) 70 int flags, struct fib_lookup_arg *arg)
71{ 71{
72 struct rt6_info *rt = NULL; 72 struct rt6_info *rt = NULL;
73 struct fib6_table *table; 73 struct fib6_table *table;
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index ce226c14bef5..1f2316187ca4 100644
--- a/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@ -1169,9 +1169,9 @@ static int fib6_clean_node(struct fib6_walker_t *w)
1169 * ignoring pure split nodes) will be scanned. 1169 * ignoring pure split nodes) will be scanned.
1170 */ 1170 */
1171 1171
1172void fib6_clean_tree(struct fib6_node *root, 1172static void fib6_clean_tree(struct fib6_node *root,
1173 int (*func)(struct rt6_info *, void *arg), 1173 int (*func)(struct rt6_info *, void *arg),
1174 int prune, void *arg) 1174 int prune, void *arg)
1175{ 1175{
1176 struct fib6_cleaner_t c; 1176 struct fib6_cleaner_t c;
1177 1177
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 41c5905d3191..e08d84063c1f 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -613,8 +613,8 @@ static struct rt6_info *rt6_alloc_clone(struct rt6_info *ort, struct in6_addr *d
613 return rt; 613 return rt;
614} 614}
615 615
616struct rt6_info *ip6_pol_route_input(struct fib6_table *table, struct flowi *fl, 616static struct rt6_info *ip6_pol_route_input(struct fib6_table *table,
617 int flags) 617 struct flowi *fl, int flags)
618{ 618{
619 struct fib6_node *fn; 619 struct fib6_node *fn;
620 struct rt6_info *rt, *nrt; 620 struct rt6_info *rt, *nrt;
@@ -872,7 +872,7 @@ static inline unsigned int ipv6_advmss(unsigned int mtu)
872} 872}
873 873
874static struct dst_entry *ndisc_dst_gc_list; 874static struct dst_entry *ndisc_dst_gc_list;
875DEFINE_SPINLOCK(ndisc_lock); 875static DEFINE_SPINLOCK(ndisc_lock);
876 876
877struct dst_entry *ndisc_dst_alloc(struct net_device *dev, 877struct dst_entry *ndisc_dst_alloc(struct net_device *dev,
878 struct neighbour *neigh, 878 struct neighbour *neigh,
diff --git a/net/netlabel/netlabel_domainhash.c b/net/netlabel/netlabel_domainhash.c
index 5bb3fad4a115..0489a1378101 100644
--- a/net/netlabel/netlabel_domainhash.c
+++ b/net/netlabel/netlabel_domainhash.c
@@ -50,11 +50,11 @@ struct netlbl_domhsh_tbl {
50/* Domain hash table */ 50/* Domain hash table */
51/* XXX - updates should be so rare that having one spinlock for the entire 51/* XXX - updates should be so rare that having one spinlock for the entire
52 * hash table should be okay */ 52 * hash table should be okay */
53DEFINE_SPINLOCK(netlbl_domhsh_lock); 53static DEFINE_SPINLOCK(netlbl_domhsh_lock);
54static struct netlbl_domhsh_tbl *netlbl_domhsh = NULL; 54static struct netlbl_domhsh_tbl *netlbl_domhsh = NULL;
55 55
56/* Default domain mapping */ 56/* Default domain mapping */
57DEFINE_SPINLOCK(netlbl_domhsh_def_lock); 57static DEFINE_SPINLOCK(netlbl_domhsh_def_lock);
58static struct netlbl_dom_map *netlbl_domhsh_def = NULL; 58static struct netlbl_dom_map *netlbl_domhsh_def = NULL;
59 59
60/* 60/*