Author: bz
Date: Tue Dec 1 14:56:00 2009
New Revision: 199992
URL: http://svn.freebsd.org/changeset/base/199992
Log:
Unbreak user space after if_timer/if_watchdog removal in r199975.
Tested by: glebius
Modified:
head/share/man/man9/ifnet.9
head/usr.bin/netstat/if.c
head/usr.bin/netstat/main.c
head/usr.bin/netstat/netstat.h
Modified: head/share/man/man9/ifnet.9
==============================================================================
--- head/share/man/man9/ifnet.9 Tue Dec 1 12:35:51 2009 (r199991)
+++ head/share/man/man9/ifnet.9 Tue Dec 1 14:56:00 2009 (r199992)
@@ -28,7 +28,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd March 14, 2007
+.Dd December 1, 2009
.Os
.Dt IFNET 9
.Sh NAME
@@ -279,13 +279,6 @@ to refer to a particular interface by in
.Xr link_addr 3 ) .
(Initialized by
.Fn if_alloc . )
-.It Va if_timer
-.Pq Vt short
-Number of seconds until the watchdog timer
-.Fn if_watchdog
-is called, or zero if the timer is disabled.
-(Set by driver,
-decremented by generic watchdog code.)
.It Va if_flags
.Pq Vt int
Flags describing operational parameters of this interface (see below).
@@ -401,11 +394,6 @@ flags and flushing queues.
See the description of
.Fn ifioctl
below for more information.
-.It Fn if_watchdog
-Routine called by the generic code when the watchdog timer,
-.Va if_timer ,
-expires.
-Usually this will reset the interface.
.\" .It Fn if_poll_recv
.\" .It Fn if_poll_xmit
.\" .It Fn if_poll_slowinput
@@ -415,7 +403,7 @@ Usually this will reset the interface.
.\" section, below.
.It Fn if_init
Initialize and bring up the hardware,
-e.g., reset the chip and the watchdog timer and enable the receiver unit.
+e.g., reset the chip and enable the receiver unit.
Should mark the interface running,
but not active
.Dv ( IFF_RUNNING , ~IIF_OACTIVE ) .
Modified: head/usr.bin/netstat/if.c
==============================================================================
--- head/usr.bin/netstat/if.c Tue Dec 1 12:35:51 2009 (r199991)
+++ head/usr.bin/netstat/if.c Tue Dec 1 14:56:00 2009 (r199992)
@@ -200,7 +200,6 @@ intpr(int interval1, u_long ifnetaddr, v
u_long ierrors;
u_long idrops;
u_long collisions;
- short timer;
int drops;
struct sockaddr *sa = NULL;
char name[IFNAMSIZ];
@@ -234,8 +233,6 @@ intpr(int interval1, u_long ifnetaddr, v
if (bflag)
printf(" %10.10s","Obytes");
printf(" %5s", "Coll");
- if (tflag)
- printf(" %s", "Time");
if (dflag)
printf(" %s", "Drop");
putchar('\n');
@@ -288,7 +285,6 @@ intpr(int interval1, u_long ifnetaddr, v
ierrors = ifnet.if_ierrors;
idrops = ifnet.if_iqdrops;
collisions = ifnet.if_collisions;
- timer = ifnet.if_timer;
drops = ifnet.if_snd.ifq_drops;
if (ifaddraddr == 0) {
@@ -435,8 +431,6 @@ intpr(int interval1, u_long ifnetaddr, v
show_stat("lu", 10, obytes, link_layer|network_layer);
show_stat("NRSlu", 5, collisions, link_layer);
- if (tflag)
- show_stat("LSd", 4, timer, link_layer);
if (dflag)
show_stat("LSd", 4, drops, link_layer);
putchar('\n');
Modified: head/usr.bin/netstat/main.c
==============================================================================
--- head/usr.bin/netstat/main.c Tue Dec 1 12:35:51 2009 (r199991)
+++ head/usr.bin/netstat/main.c Tue Dec 1 14:56:00 2009 (r199992)
@@ -339,7 +339,6 @@ int numeric_port; /* show ports numerica
static int pflag; /* show given protocol */
int rflag; /* show routing tables (or routing stats) */
int sflag; /* show protocol statistics */
-int tflag; /* show i/f watchdog timers */
int Wflag; /* wide display */
int xflag; /* extra information, includes all socket buffer info */
int zflag; /* zero stats */
@@ -455,9 +454,6 @@ main(int argc, char *argv[])
case 'S':
numeric_addr = 1;
break;
- case 't':
- tflag = 1;
- break;
case 'u':
af = AF_UNIX;
break;
Modified: head/usr.bin/netstat/netstat.h
==============================================================================
--- head/usr.bin/netstat/netstat.h Tue Dec 1 12:35:51 2009
(r199991)
+++ head/usr.bin/netstat/netstat.h Tue Dec 1 14:56:00 2009
(r199992)
@@ -49,7 +49,6 @@ extern int numeric_addr; /* show address
extern int numeric_port; /* show ports numerically */
extern int rflag; /* show routing tables (or routing stats) */
extern int sflag; /* show protocol statistics */
-extern int tflag; /* show i/f watchdog timers */
extern int Wflag; /* wide display */
extern int xflag; /* extended display, includes all socket buffer info */
extern int zflag; /* zero stats */
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
