diff options
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/tcp_ipv6.c | 2 | ||||
-rw-r--r-- | net/ipv6/udplite.c | 10 |
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 | ||
932 | struct tcp_request_sock_ops tcp_request_sock_ipv6_ops = { | 932 | static 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 | ||
18 | DEFINE_SNMP_STAT(struct udp_mib, udplite_stats_in6) __read_mostly; | 18 | DEFINE_SNMP_STAT(struct udp_mib, udplite_stats_in6) __read_mostly; |
19 | 19 | ||
20 | static __inline__ int udplitev6_rcv(struct sk_buff **pskb) | 20 | static 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 | ||
25 | static __inline__ void udplitev6_err(struct sk_buff *skb, | 25 | static 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 | ||
38 | static __inline__ int udplite_v6_get_port(struct sock *sk, unsigned short snum) | 38 | static 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 | } |