diff options
| author | darrenr <darrenr@FreeBSD.org> | 2000-07-19 14:02:09 +0000 |
|---|---|---|
| committer | darrenr <darrenr@FreeBSD.org> | 2000-07-19 14:02:09 +0000 |
| commit | 9f3624548b71b3532a679d6cedf8b009eae2f3f4 (patch) | |
| tree | a1b269f2d3702644341af5c980c8526d65859bae /sys/netinet/ip_frag.c | |
| parent | 464e3d57b81373743909c947d624bd49985749fb (diff) | |
| download | FreeBSD-src-9f3624548b71b3532a679d6cedf8b009eae2f3f4.zip FreeBSD-src-9f3624548b71b3532a679d6cedf8b009eae2f3f4.tar.gz | |
fix conflicts
Diffstat (limited to 'sys/netinet/ip_frag.c')
| -rw-r--r-- | sys/netinet/ip_frag.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/netinet/ip_frag.c b/sys/netinet/ip_frag.c index c99fe3e..8d2bbc5 100644 --- a/sys/netinet/ip_frag.c +++ b/sys/netinet/ip_frag.c @@ -7,7 +7,7 @@ */ #if !defined(lint) static const char sccsid[] = "@(#)ip_frag.c 1.11 3/24/96 (C) 1993-1995 Darren Reed"; -/*static const char rcsid[] = "@(#)$Id: ip_frag.c,v 2.4.2.4 1999/11/28 04:52:10 darrenr Exp $";*/ +/*static const char rcsid[] = "@(#)$Id: ip_frag.c,v 2.10.2.4 2000/06/06 15:49:15 darrenr Exp $";*/ static const char rcsid[] = "@(#)$FreeBSD$"; #endif @@ -145,6 +145,9 @@ ipfr_t *table[]; ipfr_t **fp, *fra, frag; u_int idx; + if (ipfr_inuse >= IPFT_SIZE) + return NULL; + frag.ipfr_p = ip->ip_p; idx = ip->ip_p; frag.ipfr_id = ip->ip_id; |
