diff options
author | stephen hemminger <stephen@networkplumber.org> | 2013-12-29 17:03:31 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-01-01 23:46:09 -0500 |
commit | e82435341ff08769b70400b72a7a8efda83c5014 (patch) | |
tree | 4216580642d3016d6d840753a402c7b8dee1a08d /net/ipv6/icmp.c | |
parent | 1d143d9f0c833fcf38cc737eb0a8698fa2dd144c (diff) |
ipv6: namespace cleanups
Running 'make namespacecheck' shows:
net/ipv6/route.o
ipv6_route_table_template
rt6_bind_peer
net/ipv6/icmp.o
icmpv6_route_lookup
ipv6_icmp_table_template
This addresses some of those warnings by:
* make icmpv6_route_lookup static
* move inline's out of ip6_route.h since only used into route.c
* move rt6_bind_peer into route.c
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/icmp.c')
-rw-r--r-- | net/ipv6/icmp.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c index eef8d945b362..5d420095190f 100644 --- a/net/ipv6/icmp.c +++ b/net/ipv6/icmp.c | |||
@@ -315,8 +315,10 @@ static void mip6_addr_swap(struct sk_buff *skb) | |||
315 | static inline void mip6_addr_swap(struct sk_buff *skb) {} | 315 | static inline void mip6_addr_swap(struct sk_buff *skb) {} |
316 | #endif | 316 | #endif |
317 | 317 | ||
318 | struct dst_entry *icmpv6_route_lookup(struct net *net, struct sk_buff *skb, | 318 | static struct dst_entry *icmpv6_route_lookup(struct net *net, |
319 | struct sock *sk, struct flowi6 *fl6) | 319 | struct sk_buff *skb, |
320 | struct sock *sk, | ||
321 | struct flowi6 *fl6) | ||
320 | { | 322 | { |
321 | struct dst_entry *dst, *dst2; | 323 | struct dst_entry *dst, *dst2; |
322 | struct flowi6 fl2; | 324 | struct flowi6 fl2; |
@@ -984,7 +986,7 @@ int icmpv6_err_convert(u8 type, u8 code, int *err) | |||
984 | EXPORT_SYMBOL(icmpv6_err_convert); | 986 | EXPORT_SYMBOL(icmpv6_err_convert); |
985 | 987 | ||
986 | #ifdef CONFIG_SYSCTL | 988 | #ifdef CONFIG_SYSCTL |
987 | struct ctl_table ipv6_icmp_table_template[] = { | 989 | static struct ctl_table ipv6_icmp_table_template[] = { |
988 | { | 990 | { |
989 | .procname = "ratelimit", | 991 | .procname = "ratelimit", |
990 | .data = &init_net.ipv6.sysctl.icmpv6_time, | 992 | .data = &init_net.ipv6.sysctl.icmpv6_time, |