summaryrefslogtreecommitdiffstats
path: root/usr.bin/netstat
diff options
context:
space:
mode:
authorbz <bz@FreeBSD.org>2009-12-01 14:56:00 +0000
committerbz <bz@FreeBSD.org>2009-12-01 14:56:00 +0000
commit3595d5cfed7d9eaa4ef3c6d382c4564a6df138f2 (patch)
tree8d3073d931debd0983ea8fb1f909269e211622ed /usr.bin/netstat
parent3c3bf7569ef5da9014f27c65c577f5db3c4d803d (diff)
downloadFreeBSD-src-3595d5cfed7d9eaa4ef3c6d382c4564a6df138f2.zip
FreeBSD-src-3595d5cfed7d9eaa4ef3c6d382c4564a6df138f2.tar.gz
Unbreak user space after if_timer/if_watchdog removal in r199975.
Tested by: glebius
Diffstat (limited to 'usr.bin/netstat')
-rw-r--r--usr.bin/netstat/if.c6
-rw-r--r--usr.bin/netstat/main.c4
-rw-r--r--usr.bin/netstat/netstat.h1
3 files changed, 0 insertions, 11 deletions
diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c
index e9e77b9..02f390a 100644
--- a/usr.bin/netstat/if.c
+++ b/usr.bin/netstat/if.c
@@ -200,7 +200,6 @@ intpr(int interval1, u_long ifnetaddr, void (*pfunc)(char *))
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, void (*pfunc)(char *))
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, void (*pfunc)(char *))
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, void (*pfunc)(char *))
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');
diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c
index b1c4940..d2f6b46 100644
--- a/usr.bin/netstat/main.c
+++ b/usr.bin/netstat/main.c
@@ -339,7 +339,6 @@ int numeric_port; /* show ports numerically */
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;
diff --git a/usr.bin/netstat/netstat.h b/usr.bin/netstat/netstat.h
index 259ca82..c224f46 100644
--- a/usr.bin/netstat/netstat.h
+++ b/usr.bin/netstat/netstat.h
@@ -49,7 +49,6 @@ extern int numeric_addr; /* show addresses numerically */
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 */
OpenPOWER on IntegriCloud