diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-05 06:47:02 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-05 06:47:02 +0000 |
| commit | 99a7e12f34b3661a0d1354eef83a0eef4df5e34c (patch) | |
| tree | 3560aca9ca86792f9ab7bd87861ea143a1b3c7a3 /net/ipv6/udp.c | |
| parent | e73a04659c0b8cdee4dd40e58630e2cf63afb316 (diff) | |
Merge with Linux 2.3.38.
Diffstat (limited to 'net/ipv6/udp.c')
| -rw-r--r-- | net/ipv6/udp.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 6c2777b32..7bc3a3914 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -7,7 +7,7 @@ * * Based on linux/ipv4/udp.c * - * $Id: udp.c,v 1.45 1999/08/20 11:06:32 davem Exp $ + * $Id: udp.c,v 1.47 2000/01/05 21:27:54 davem Exp $ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -341,10 +341,6 @@ static void udpv6_close(struct sock *sk, long timeout) inet_sock_release(sk); } -#ifndef HAVE_CSUM_COPY_USER -#undef CONFIG_UDP_DELAY_CSUM -#endif - /* * This should be easy, if there is something there we * return it, otherwise we block. |