diff options
| author | David Ahern <dsahern@kernel.org> | 2022-07-06 08:46:12 -0600 |
|---|---|---|
| committer | David Ahern <dsahern@kernel.org> | 2022-07-06 08:46:12 -0600 |
| commit | e903fdfb560ec3ae44df788f1878d0c81b2d5327 (patch) | |
| tree | 39467aa071c7be38a649d11ce4a19961adc6aa34 | |
| parent | 37f3cb9be0617756699563a434465101f7b69285 (diff) | |
| parent | 329fda1861560b06e60a7bd1004647bb65708295 (diff) | |
| download | iproute2-e903fdfb560ec3ae44df788f1878d0c81b2d5327.tar.gz | |
Merge branch 'main' into next
Signed-off-by: David Ahern <dsahern@kernel.org>
| -rw-r--r-- | include/uapi/linux/mptcp.h | 5 | ||||
| -rw-r--r-- | ip/ipaddress.c | 10 | ||||
| -rw-r--r-- | man/man8/tc-fq_codel.8 | 7 |
3 files changed, 16 insertions, 6 deletions
diff --git a/include/uapi/linux/mptcp.h b/include/uapi/linux/mptcp.h index 1e07e2d95..f4ef46a1d 100644 --- a/include/uapi/linux/mptcp.h +++ b/include/uapi/linux/mptcp.h @@ -2,14 +2,15 @@ #ifndef _MPTCP_H #define _MPTCP_H +#include <netinet/in.h> /* for sockaddr_in and sockaddr_in6 */ +#include <sys/socket.h> /* for struct sockaddr */ + #include <linux/const.h> #include <linux/types.h> #include <linux/in.h> /* for sockaddr_in */ #include <linux/in6.h> /* for sockaddr_in6 */ #include <linux/socket.h> /* for sockaddr_storage and sa_family */ -#include <sys/socket.h> /* for struct sockaddr */ - #define MPTCP_SUBFLOW_FLAG_MCAP_REM _BITUL(0) #define MPTCP_SUBFLOW_FLAG_MCAP_LOC _BITUL(1) #define MPTCP_SUBFLOW_FLAG_JOIN_REM _BITUL(2) diff --git a/ip/ipaddress.c b/ip/ipaddress.c index e0eb41bc8..5387b6a6b 100644 --- a/ip/ipaddress.c +++ b/ip/ipaddress.c @@ -789,13 +789,15 @@ void print_stats64(FILE *fp, struct rtnl_link_stats64 *s, s->tx_bytes, s->tx_packets, s->tx_errors, s->tx_dropped, s->tx_carrier_errors, s->collisions, s->tx_compressed); - if (show_stats > 1) + if (show_stats > 1) { + uint64_t cc = carrier_changes ? + rta_getattr_u32(carrier_changes) : 0; + size_columns(cols, ARRAY_SIZE(cols), 0, 0, s->tx_aborted_errors, s->tx_fifo_errors, s->tx_window_errors, - s->tx_heartbeat_errors, - carrier_changes ? - rta_getattr_u32(carrier_changes) : 0); + s->tx_heartbeat_errors, cc); + } /* RX stats */ fprintf(fp, " RX: %*s %*s %*s %*s %*s %*s %*s%s", diff --git a/man/man8/tc-fq_codel.8 b/man/man8/tc-fq_codel.8 index 43f650840..78590636a 100644 --- a/man/man8/tc-fq_codel.8 +++ b/man/man8/tc-fq_codel.8 @@ -101,6 +101,13 @@ result of this masking equals VALUE, will the .B ce_threshold logic be applied to the packet. +.SS drop_batch +sets the maximum number of packets to drop when +.B limit +or +.B memory_limit +is exceeded. Default value is 64. + .SH EXAMPLES #tc qdisc add dev eth0 root fq_codel .br |