ipv6: namespace cleanups
Subsystems (3)
PATCH 1/1 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
--- include/net/ip6_route.h | 20 ------------------ include/net/ipv6.h | 4 --- net/ipv6/icmp.c | 8 ++++--- net/ipv6/route.c | 51 ++++++++++++++++++++++++++++++++---------------- 4 files changed, 40 insertions(+), 43 deletions(-)
include/net/ipv6.h +0 -4
@@ -267,9 +267,6 @@ void icmpv6_notify(struct sk_buff *skb,int icmpv6_push_pending_frames (struct sock *sk,struct flowi6 *fl6,struct icmp6hdr *thdr,int len); -struct dst_entry *icmpv6_route_lookup (struct net *net,struct sk_buff *skb, -struct sock *sk,struct flowi6 *fl6); -int ip6_ra_control (struct sock *sk,int sel);int ipv6_parse_hopopts (struct sk_buff *skb);
@@ -839,7 +836,6 @@ static inline int snmp6_unregister_dev(s#ifdef CONFIG_SYSCTL extern struct ctl_table ipv6_route_table_template[]; -extern struct ctl_table ipv6_icmp_table_template[];struct ctl_table *ipv6_icmp_sysctl_init (struct net *net);struct ctl_table *ipv6_route_sysctl_init (struct net *net);
net/ipv6/icmp.c +5 -3
@@ -315,8 +315,10 @@ static void mip6_addr_swap(struct sk_bufstatic inline void mip6_addr_swap (struct sk_buff *skb) {}#endif -struct dst_entry *icmpv6_route_lookup (struct net *net,struct sk_buff *skb, -struct sock *sk,struct flowi6 *fl6) +static struct dst_entry *icmpv6_route_lookup (struct net *net, +struct sk_buff *skb, +struct sock *sk, +struct flowi6 *fl6) {struct dst_entry *dst, *dst2;struct flowi6 fl2;
@@ -984,7 +986,7 @@ int icmpv6_err_convert(u8 type, u8 code,EXPORT_SYMBOL (icmpv6_err_convert); #ifdef CONFIG_SYSCTL -struct ctl_table ipv6_icmp_table_template[] = { +static struct ctl_table ipv6_icmp_table_template[] = { { .procname = "ratelimit", .data = &init_net.ipv6.sysctl.icmpv6_time,
include/net/ip6_route.h +0 -20
@@ -51,26 +51,6 @@ static inline unsigned int rt6_flags2srcreturn (flags >>3 ) &7 ; } -void rt6_bind_peer (struct rt6_info *rt,int create); - -static inline struct inet_peer *__rt6_get_peer (struct rt6_info *rt,int create) -{ -if (rt6_has_peer (rt)) -return rt6_peer_ptr (rt); - -rt6_bind_peer (rt, create); -return (rt6_has_peer (rt) ?rt6_peer_ptr (rt) :NULL ); -} - -static inline struct inet_peer *rt6_get_peer (struct rt6_info *rt) -{ -return __rt6_get_peer (rt,0 ); -} - -static inline struct inet_peer *rt6_get_peer_create (struct rt6_info *rt) -{ -return __rt6_get_peer (rt,1 ); -}void ip6_route_input (struct sk_buff *skb);
net/ipv6/route.c +30 -16
58 lines not on this page · raw message
From: Stephen Hemminger <[email protected]>
Date: Sun, 29 Dec 2013 14:03:31 -0800
Quoted 8 lines
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
Quoted 6 lines
This addresses some of those warnings by:
* makeicmpv6_route_lookupstatic
* move inline's out ofip6_route.hsince only used intoroute.c
* movert6_bind_peerintoroute.cSigned-off-by Stephen Hemminger <[email protected]>
Applied.