Date: Sun, 18 Jun 2006 10:16:31 +0400 (MSD) From: Maxim Konovalov <maxim@macomnet.ru> To: Robert Watson <rwatson@FreeBSD.org> Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, Andre Oppermann <andre@FreeBSD.org>, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/netinet tcp_input.c tcp_syncache.c tcp_var.h Message-ID: <20060618101345.V10122@mp2.macomnet.net> In-Reply-To: <20060618013509.M67789@fledge.watson.org> References: <200606171732.k5HHWdl9086272@repoman.freebsd.org> <20060618013509.M67789@fledge.watson.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sun, 18 Jun 2006, 01:37+0100, Robert Watson wrote:
>
> On Sat, 17 Jun 2006, Andre Oppermann wrote:
>
> > Revision Changes Path
> > 1.299 +9 -6 src/sys/netinet/tcp_input.c
> > 1.87 +286 -255 src/sys/netinet/tcp_syncache.c
> > 1.130 +9 -6 src/sys/netinet/tcp_var.h
>
> This change appears to have broken world on all architectures by
> exposing the mutex data structure to usr.bin/netstat/inet.c via
> tcp_var.h. I'm not quite sure what the "right" solution is, but if
usr.bin/systat/netstat.c and usr.bin/netstat/inet.c
contrib/bsnmp/snmp_mibII/mibII_tcp.c as well.
+#include <sys/callout.h> fixes the build.
Index: usr.bin/systat/netstat.c
===================================================================
RCS file: /home/ncvs/src/usr.bin/systat/netstat.c,v
retrieving revision 1.25
diff -u -p -r1.25 netstat.c
--- usr.bin/systat/netstat.c 30 Apr 2006 04:47:23 -0000 1.25
+++ usr.bin/systat/netstat.c 17 Jun 2006 22:32:03 -0000
@@ -43,6 +43,7 @@ static const char sccsid[] = "@(#)netsta
* netstat
*/
#include <sys/param.h>
+#include <sys/callout.h>
#include <sys/queue.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
Index: usr.bin/netstat/inet.c
===================================================================
RCS file: /home/ncvs/src/usr.bin/netstat/inet.c,v
retrieving revision 1.70
diff -u -p -r1.70 inet.c
--- usr.bin/netstat/inet.c 12 Apr 2005 08:47:04 -0000 1.70
+++ usr.bin/netstat/inet.c 17 Jun 2006 22:25:36 -0000
@@ -41,6 +41,7 @@ static char sccsid[] = "@(#)inet.c 8.5 (
__FBSDID("$FreeBSD: src/usr.bin/netstat/inet.c,v 1.70 2005/04/12 08:47:04 ru Exp $");
#include <sys/param.h>
+#include <sys/callout.h>
#include <sys/queue.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
Index: contrib/bsnmp/snmp_mibII/mibII_tcp.c
===================================================================
RCS file: /home/ncvs/src/contrib/bsnmp/snmp_mibII/mibII_tcp.c,v
retrieving revision 1.1.1.4
diff -u -p -r1.1.1.4 mibII_tcp.c
--- contrib/bsnmp/snmp_mibII/mibII_tcp.c 23 May 2005 11:19:09 -0000 1.1.1.4
+++ contrib/bsnmp/snmp_mibII/mibII_tcp.c 17 Jun 2006 22:40:28 -0000
@@ -32,6 +32,7 @@
*/
#include "mibII.h"
#include "mibII_oid.h"
+#include <sys/callout.h>
#include <sys/socketvar.h>
#include <netinet/in_pcb.h>
#include <netinet/tcp.h>
%%%
--
Maxim Konovalov
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060618101345.V10122>