aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2006-11-30 20:22:29 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-03 00:31:51 -0500
commitf5b99bcdddfb2338227faad3489c24907f37ee8e (patch)
treeab12dd443300df741e388ca80df0860dc65d24b0 /net/ipv6
parent2718aa7c55ba7264dd463b8f7006f0975366fa7b (diff)
[NET]: Possible cleanups.
This patch contains the following possible cleanups: - make the following needlessly global functions statis: - ipv4/tcp.c: __tcp_alloc_md5sig_pool() - ipv4/tcp_ipv4.c: tcp_v4_reqsk_md5_lookup() - ipv4/udplite.c: udplite_rcv() - ipv4/udplite.c: udplite_err() - make the following needlessly global structs static: - ipv4/tcp_ipv4.c: tcp_request_sock_ipv4_ops - ipv4/tcp_ipv4.c: tcp_sock_ipv4_specific - ipv6/tcp_ipv6.c: tcp_request_sock_ipv6_ops - net/ipv{4,6}/udplite.c: remove inline's from static functions (gcc should know best when to inline them) Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/tcp_ipv6.c2
-rw-r--r--net/ipv6/udplite.c10
2 files changed, 6 insertions, 6 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 517c50024bfc..dd1a23b5a0f5 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -929,7 +929,7 @@ static struct request_sock_ops tcp6_request_sock_ops __read_mostly = {
929 .send_reset = tcp_v6_send_reset 929 .send_reset = tcp_v6_send_reset
930}; 930};
931 931
932struct tcp_request_sock_ops tcp_request_sock_ipv6_ops = { 932static struct tcp_request_sock_ops tcp_request_sock_ipv6_ops = {
933#ifdef CONFIG_TCP_MD5SIG 933#ifdef CONFIG_TCP_MD5SIG
934 .md5_lookup = tcp_v6_reqsk_md5_lookup, 934 .md5_lookup = tcp_v6_reqsk_md5_lookup,
935#endif 935#endif
diff --git a/net/ipv6/udplite.c b/net/ipv6/udplite.c
index d4cafacc235b..629f97162fbc 100644
--- a/net/ipv6/udplite.c
+++ b/net/ipv6/udplite.c
@@ -17,14 +17,14 @@
17 17
18DEFINE_SNMP_STAT(struct udp_mib, udplite_stats_in6) __read_mostly; 18DEFINE_SNMP_STAT(struct udp_mib, udplite_stats_in6) __read_mostly;
19 19
20static __inline__ int udplitev6_rcv(struct sk_buff **pskb) 20static int udplitev6_rcv(struct sk_buff **pskb)
21{ 21{
22 return __udp6_lib_rcv(pskb, udplite_hash, 1); 22 return __udp6_lib_rcv(pskb, udplite_hash, 1);
23} 23}
24 24
25static __inline__ void udplitev6_err(struct sk_buff *skb, 25static void udplitev6_err(struct sk_buff *skb,
26 struct inet6_skb_parm *opt, 26 struct inet6_skb_parm *opt,
27 int type, int code, int offset, __be32 info) 27 int type, int code, int offset, __be32 info)
28{ 28{
29 return __udp6_lib_err(skb, opt, type, code, offset, info, udplite_hash); 29 return __udp6_lib_err(skb, opt, type, code, offset, info, udplite_hash);
30} 30}
@@ -35,7 +35,7 @@ static struct inet6_protocol udplitev6_protocol = {
35 .flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL, 35 .flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,
36}; 36};
37 37
38static __inline__ int udplite_v6_get_port(struct sock *sk, unsigned short snum) 38static int udplite_v6_get_port(struct sock *sk, unsigned short snum)
39{ 39{
40 return udplite_get_port(sk, snum, ipv6_rcv_saddr_equal); 40 return udplite_get_port(sk, snum, ipv6_rcv_saddr_equal);
41} 41}