--- a/packages/net/tcpip/current/ChangeLog
+++ b/packages/net/tcpip/current/ChangeLog
@@ -1,3 +1,113 @@
+2002-05-14  Jesper Skov  <jskov@redhat.com>
+
+	* include/netinet6/in6.h: Fixed warnings.
+
+	* src/sys/kern/uipc_socket2.c (sblock): Fixed warning.
+	* src/sys/netinet/tcp_input.c: Same.
+	* src/sys/net/if_loop.c (looutput): Same.
+	* src/sys/kern/sockio.c: Same.
+
+	* include/sys/param.h: Include machine headers after the namespace
+	changing macros to get the desired declarations, thus fixing
+	compiler warnings.
+
+2002-04-26  Gary Thomas  <gthomas@redhat.com>
+
+	* src/sys/netinet/ip_input.c: Proper "extern" definition of 'ipstat'.
+
+	* src/sys/netinet/raw_ip.c: 
+	* src/sys/netinet/ip_output.c: 
+	* include/netinet/ip_var.h: Use of ramdom IP packet id is optional.
+
+2002-04-22  Gary Thomas  <gthomas@redhat.com>
+
+	* src/sys/netinet/tcp_usrreq.c: 
+	* src/sys/netinet/tcp_output.c: 
+	* src/sys/netinet/tcp_input.c: 
+	* src/sys/netinet/tcp_debug.c: 
+	* include/netinet/tcp_debug.h: Fully conditionalize on TCPDEBUG.
+
+2002-03-27  Jonathan Larmour  <jlarmour@redhat.com>
+
+	* doc/openbsd.sgml: Manpages now live in "common" BSD package.
+
+2002-03-19  Gary Thomas  <gthomas@redhat.com>
+
+	* src/sys/net/route.c (cyg_route_reinit): Renamed from route_reinit.
+
+2002-03-11  Hugo Tyson  <hmt@redhat.com> 
+
+	[Case 107110]
+
+	* src/sys/netinet/in.c (in_control): SIOCSIFADDR switch entry
+	moved to before the scan for this same address being in the list
+	already, along with Add and Delete (SIOCAIFADDR,SIOCDIFADDR) arms.
+	It falls through into the same alloc-if-needed code anyway.
+	Thus repeatedly setting the same address does not leak store.
+
+	* src/sys/net/route.c (route_reinit): Rewrite to delete all routes
+	individually rather than en-masse (leaking store).
+	(rt_reinit_rtdelete): New function; callback for individual
+	deletion.
+	(rtioctl): Do not pass in a "route **" to return a pointer to the
+	route removed or added; this results in an extra reference, by the
+	returned pointer, and so a storeleak.
+	(rtrequest): RTM_DELETE arm: do not free a gateway route if the
+	gateway pointer is the same as the route itself - it gets freed
+	*again* at the end of the routine if you do.  Just dec the refcnt.
+
+2002-03-07  Gary Thomas  <gthomas@redhat.com>
+
+	* include/sys/param.h: Privatize route_reinit(), arc4random().
+
+2002-02-28  Hugo Tyson  <hmt@redhat.com>
+2002-02-28  Martin Buck <martin.buck@ascom.ch>
+
+	* src/sys/net/if_ethersubr.c (ether_input): [Bugzilla 60318]
+	ether_input() schedules processing by calling schednetisr(FOO) and
+	then queues the frame afterwards.  Where we cannot be preempted
+	eg. in a DSR or in the original BSD kernel, this is OK.  In eCos
+	the call to schednetisr(FOO) might cause a context switch *before*
+	the frame is enqueued.  This "jams" one packet in the queue,
+	delaying it until the next packet, and so on.
+
+	This change makes ether_input() store up the schednetisr() arg
+	until the end, and do the call then, much like it does with the
+	queue to use.  Thanks Martin!
+
+2002-02-22  Hugo Tyson  <hmt@redhat.com>
+
+	* doc/openbsd.sgml: New file; separated stack-specific docs from
+	monolithic net doc, and tidied up in various ways.
+
+2002-02-15  Gary Thomas  <gthomas@redhat.com>
+
+	* cdl/openbsd_net.cdl: Slight changes in layout required by split
+	of network stacks.
+
+2002-02-13  Jonathan Larmour  <jlarmour@redhat.com>
+2002-02-13  Andrew Lunn  <andrew.lunn@ascom.ch>
+
+	* include/sys/mbuf.h: Declare variables as extern in header.
+	* src/sys/kern/uipc_mbuf.c: Define mbtypes[] and init it.
+
+2002-02-05  Hugo Tyson  <hmt@redhat.com>
+
+	* cdl/openbsd_net.cdl: Place this package below  CYGPKG_NET
+	ie. the common networking package.  Only affects the view in the
+	GUI CT, no big deal.
+
+2002-01-28  Gary Thomas  <gthomas@redhat.com>
+
+	* src/sys/netinet/ip_input.c: inet_ntoa() is now common.
+
+	* cdl/openbsd_net.cdl: Renamed from net.cdl.  This package
+	is now a proper sub-package, implementing a network stack.
+
+2002-01-28  Jonathan Larmour  <jlarmour@redhat.com>
+
+	* cdl/net.cdl: Clarify CYGPKG_NET_ROUTING description.
+
 2002-01-08  Jonathan Larmour  <jlarmour@redhat.com>
 
 	* tests/server_test.c (server_test): Correct port conversion.
@@ -1562,31 +1672,12 @@ 2000-02-08  John Dallaway  <jld@cygnus.c
 
 	Tidy display strings.
 
-//===========================================================================
-//####COPYRIGHTBEGIN####
-//                                                                          
-// -------------------------------------------                              
-// The contents of this file are subject to the Red Hat eCos Public License 
-// Version 1.1 (the "License"); you may not use this file except in         
-// compliance with the License.  You may obtain a copy of the License at    
-// http://www.redhat.com/                                                   
-//                                                                          
-// Software distributed under the License is distributed on an "AS IS"      
-// basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See the 
-// License for the specific language governing rights and limitations under 
-// the License.                                                             
-//                                                                          
-// The Original Code is eCos - Embedded Configurable Operating System,      
-// released September 30, 1998.                                             
-//                                                                          
-// The Initial Developer of the Original Code is Red Hat.                   
-// Portions created by Red Hat are                                          
-// Copyright (C) 1998, 1999, 2000, 2001 Red Hat, Inc.                             
-// All Rights Reserved.                                                     
-// -------------------------------------------                              
-//                                                                          
-//####COPYRIGHTEND####
-//===========================================================================
-	
-	
-
+#####ECOSPDCOPYRIGHTBEGIN####
+#
+# Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
+# All Rights Reserved.
+#
+# Permission is granted to use, copy, modify and redistribute this
+# file.
+#
+#####ECOSPDCOPYRIGHTEND####