aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/ipv6_sockglue.c
diff options
context:
space:
mode:
authorYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>2008-02-29 11:06:47 -0500
committerYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>2008-03-04 01:18:22 -0500
commite898d4db2749c6052072e9bc4448e396cbdeb06a (patch)
tree2b8673d85210a23e67d0817b18f401411e8936f3 /net/ipv6/ipv6_sockglue.c
parentc6aefafb7ec620911d46174eed514f9df639e5a4 (diff)
[UDP]: Allow users to configure UDP-Lite.
Let's give users an option for disabling UDP-Lite (~4K). old: | text data bss dec hex filename | 286498 12432 6072 305002 4a76a net/ipv4/built-in.o | 193830 8192 3204 205226 321aa net/ipv6/ipv6.o new (without UDP-Lite): | text data bss dec hex filename | 284086 12136 5432 301654 49a56 net/ipv4/built-in.o | 191835 7832 3076 202743 317f7 net/ipv6/ipv6.o Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Diffstat (limited to 'net/ipv6/ipv6_sockglue.c')
-rw-r--r--net/ipv6/ipv6_sockglue.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
index bf2a686aa13..0a18fecb93d 100644
--- a/net/ipv6/ipv6_sockglue.c
+++ b/net/ipv6/ipv6_sockglue.c
@@ -239,7 +239,9 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,
239 struct sk_buff *pktopt; 239 struct sk_buff *pktopt;
240 240
241 if (sk->sk_protocol != IPPROTO_UDP && 241 if (sk->sk_protocol != IPPROTO_UDP &&
242#ifdef CONFIG_IP_UDPLITE
242 sk->sk_protocol != IPPROTO_UDPLITE && 243 sk->sk_protocol != IPPROTO_UDPLITE &&
244#endif
243 sk->sk_protocol != IPPROTO_TCP) 245 sk->sk_protocol != IPPROTO_TCP)
244 break; 246 break;
245 247
@@ -279,7 +281,7 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,
279 } else { 281 } else {
280 struct proto *prot = &udp_prot; 282 struct proto *prot = &udp_prot;
281 283
282 if (sk->sk_protocol == IPPROTO_UDPLITE) 284 if (IS_PROTO_UDPLITE(sk->sk_protocol))
283 prot = &udplite_prot; 285 prot = &udplite_prot;
284 local_bh_disable(); 286 local_bh_disable();
285 sock_prot_inuse_add(sk->sk_prot, -1); 287 sock_prot_inuse_add(sk->sk_prot, -1);
@@ -844,7 +846,9 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
844 switch (optname) { 846 switch (optname) {
845 case IPV6_ADDRFORM: 847 case IPV6_ADDRFORM:
846 if (sk->sk_protocol != IPPROTO_UDP && 848 if (sk->sk_protocol != IPPROTO_UDP &&
849#ifdef CONFIG_IP_UDPLITE
847 sk->sk_protocol != IPPROTO_UDPLITE && 850 sk->sk_protocol != IPPROTO_UDPLITE &&
851#endif
848 sk->sk_protocol != IPPROTO_TCP) 852 sk->sk_protocol != IPPROTO_TCP)
849 return -EINVAL; 853 return -EINVAL;
850 if (sk->sk_state != TCP_ESTABLISHED) 854 if (sk->sk_state != TCP_ESTABLISHED)