]>
Commit | Line | Data |
---|---|---|
e42218cf PS |
1 | --- iproute2/ip/ipaddress.c.orig 2001-08-23 06:07:46.000000000 +0200 |
2 | +++ iproute2/ip/ipaddress.c 2004-04-04 22:56:52.306961528 +0200 | |
3 | @@ -220,9 +220,9 @@ | |
4 | s = &slocal; | |
5 | } | |
4e717d7b | 6 | fprintf(fp, "%s", _SL_); |
e42218cf PS |
7 | - fprintf(fp, " RX: bytes packets errors dropped overrun mcast %s%s", |
8 | + fprintf(fp, " RX: bytes packets errors dropped overrun mcast %s%s", | |
4e717d7b | 9 | s->rx_compressed ? "compressed" : "", _SL_); |
e42218cf | 10 | - fprintf(fp, " %-10lu %-8lu %-7lu %-7lu %-7lu %-7lu", |
4e717d7b | 11 | + fprintf(fp, " %-14lu %-8lu %-7lu %-7lu %-7lu %-7lu", |
12 | s->rx_bytes, s->rx_packets, s->rx_errors, | |
13 | s->rx_dropped, s->rx_over_errors, | |
14 | s->multicast | |
e42218cf PS |
15 | @@ -232,7 +232,7 @@ |
16 | if (show_stats > 1) { | |
17 | fprintf(fp, "%s", _SL_); | |
18 | fprintf(fp, " RX errors: length crc frame fifo missed%s", _SL_); | |
19 | - fprintf(fp, " %-7lu %-7lu %-7lu %-7lu %-7lu", | |
20 | + fprintf(fp, " %-7lu %-7lu %-7lu %-7lu %-7lu", | |
21 | s->rx_length_errors, | |
22 | s->rx_crc_errors, | |
23 | s->rx_frame_errors, | |
24 | @@ -241,9 +241,9 @@ | |
25 | ); | |
26 | } | |
4e717d7b | 27 | fprintf(fp, "%s", _SL_); |
e42218cf PS |
28 | - fprintf(fp, " TX: bytes packets errors dropped carrier collsns %s%s", |
29 | + fprintf(fp, " TX: bytes packets errors dropped carrier collsns %s%s", | |
4e717d7b | 30 | s->tx_compressed ? "compressed" : "", _SL_); |
e42218cf | 31 | - fprintf(fp, " %-10lu %-8lu %-7lu %-7lu %-7lu %-7lu", |
4e717d7b | 32 | + fprintf(fp, " %-14lu %-8lu %-7lu %-7lu %-7lu %-7lu", |
33 | s->tx_bytes, s->tx_packets, s->tx_errors, | |
34 | s->tx_dropped, s->tx_carrier_errors, s->collisions); | |
35 | if (s->tx_compressed) | |
e42218cf PS |
36 | @@ -251,7 +251,7 @@ |
37 | if (show_stats > 1) { | |
38 | fprintf(fp, "%s", _SL_); | |
39 | fprintf(fp, " TX errors: aborted fifo window heartbeat%s", _SL_); | |
40 | - fprintf(fp, " %-7lu %-7lu %-7lu %-7lu", | |
41 | + fprintf(fp, " %-7lu %-7lu %-7lu %-7lu", | |
42 | s->tx_aborted_errors, | |
43 | s->tx_fifo_errors, | |
44 | s->tx_window_errors, | |
45 | @@ -603,7 +603,7 @@ | |
46 | fprintf(stderr, "Flush terminated\n"); | |
47 | exit(1); | |
48 | } | |
49 | - if (filter.flushed == 0) { | |
50 | + if (filter.flushed == 0 || round > 10000) { | |
51 | if (round == 0) { | |
52 | fprintf(stderr, "Nothing to flush.\n"); | |
53 | } else if (show_stats) |