diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-06-22 23:05:57 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-06-22 23:05:57 +0000 |
| commit | 51d3b7814cdccef9188240fe0cbd8d97ff2c7470 (patch) | |
| tree | 5cbb01d0323d4f63ade66bdf48ba4a91aaa6df16 /net/ipv4 | |
| parent | 52273a23c9a84336b93a35e4847fc88fac7eb0e4 (diff) | |
Merge with Linux 2.3.7.
WARNING: 2.3.7 is known to eat filesystems for breakfast and little
children for lunch, so if you try this on your machine make backups
first ...
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/ip_fragment.c | 4 | ||||
| -rw-r--r-- | net/ipv4/udp.c | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c index 29747fee6..b1bd8b1dc 100644 --- a/net/ipv4/ip_fragment.c +++ b/net/ipv4/ip_fragment.c @@ -5,7 +5,7 @@ * * The IP fragmentation functionality. * - * Version: $Id: ip_fragment.c,v 1.41 1999/05/27 00:38:07 davem Exp $ + * Version: $Id: ip_fragment.c,v 1.42 1999/06/12 13:11:34 davem Exp $ * * Authors: Fred N. van Kempen <waltje@uWalt.NL.Mugnet.ORG> * Alan Cox <Alan.Cox@linux.org> @@ -218,7 +218,7 @@ static void ip_expire(unsigned long arg) out: /* Nuke the fragment queue. */ ip_free(qp); - spin_lock(&ipfrag_lock); + spin_unlock(&ipfrag_lock); } /* Memory limiting on fragments. Evictor trashes the oldest diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 320e5151e..d43ebe0d3 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -655,11 +655,7 @@ int udp_sendmsg(struct sock *sk, struct msghdr *msg, int len) if (msg->msg_namelen < sizeof(*usin)) return(-EINVAL); if (usin->sin_family != AF_INET) { - static int complained; - if (!complained++) - printk(KERN_WARNING "%s forgot to set AF_INET in udp sendmsg. Fix it!\n", current->comm); - if (usin->sin_family) - return -EINVAL; + return -EINVAL; } ufh.daddr = usin->sin_addr.s_addr; ufh.uh.dest = usin->sin_port; |