matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into next 

Conflicts:
	devlink/devlink.c

Fixed the conflict by updating the numbering for all new attributes
after the ones in master branch.

Signed-off-by: David Ahern <dsahern@gmail.com>
This commit is contained in:
David Ahern 2019-09-19 07:55:53 -07:00
parent 88fdbf8030 80d0e62673
commit a32692ac9c
5 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
devlink/devlink.c
View File

@ -255,11 +255,11 @@ static void ifname_map_free(struct ifname_map *ifname_map)
#define DL_OPT_FLASH_FILE_NAME BIT(25) #define DL_OPT_FLASH_FILE_NAME BIT(25)
#define DL_OPT_FLASH_COMPONENT BIT(26) #define DL_OPT_FLASH_COMPONENT BIT(26)
#define DL_OPT_HEALTH_REPORTER_NAME BIT(27) #define DL_OPT_HEALTH_REPORTER_NAME BIT(27)
#define DL_OPT_HEALTH_REPORTER_GRACEFUL_PERIOD BIT(27) #define DL_OPT_HEALTH_REPORTER_GRACEFUL_PERIOD BIT(28)
#define DL_OPT_HEALTH_REPORTER_AUTO_RECOVER BIT(28) #define DL_OPT_HEALTH_REPORTER_AUTO_RECOVER BIT(29)
#define DL_OPT_TRAP_NAME BIT(29) #define DL_OPT_TRAP_NAME BIT(30)
#define DL_OPT_TRAP_ACTION BIT(30) #define DL_OPT_TRAP_ACTION BIT(31)
#define DL_OPT_TRAP_GROUP_NAME BIT(31) #define DL_OPT_TRAP_GROUP_NAME BIT(32)
struct dl_opts { struct dl_opts {
uint64_t present; /* flags of present items */ uint64_t present; /* flags of present items */

2
ip/ipnexthop.c
View File

@ -249,7 +249,7 @@ int print_nexthop(struct nlmsghdr *n, void *arg)
} }
if (tb[NHA_BLACKHOLE]) if (tb[NHA_BLACKHOLE])
print_null(PRINT_ANY, "blackhole", "blackhole", NULL); print_null(PRINT_ANY, "blackhole", "blackhole ", NULL);
if (nhm->nh_protocol != RTPROT_UNSPEC || show_details > 0) { if (nhm->nh_protocol != RTPROT_UNSPEC || show_details > 0) {
print_string(PRINT_ANY, "protocol", "proto %s ", print_string(PRINT_ANY, "protocol", "proto %s ",

8
ip/link_xfrm.c
View File

@ -17,7 +17,7 @@ static void xfrm_print_help(struct link_util *lu, int argc, char **argv,
FILE *f) FILE *f)
{ {
fprintf(f, fprintf(f,
"Usage: ... %-4s dev PHYS_DEV [ if_id IF-ID ]\n" "Usage: ... %-4s dev [ PHYS_DEV ] [ if_id IF-ID ]\n"
"\n" "\n"
"Where: IF-ID := { 0x0..0xffffffff }\n", "Where: IF-ID := { 0x0..0xffffffff }\n",
lu->id); lu->id);
@ -46,12 +46,8 @@ static int xfrm_parse_opt(struct link_util *lu, int argc, char **argv,
argc--; argv++; argc--; argv++;
} }
if (link) { if (link)
addattr32(n, 1024, IFLA_XFRM_LINK, link); addattr32(n, 1024, IFLA_XFRM_LINK, link);
} else {
fprintf(stderr, "must specify physical device\n");
return -1;
}
return 0; return 0;
} }

8
man/man8/ss.8
View File

@ -99,13 +99,13 @@ skmem:(r<rmem_alloc>,rb<rcv_buf>,t<wmem_alloc>,tb<snd_buf>,
.br .br
.RS .RS
.RS .RS
f<fwd_alloc>,w<wmem_queued>, f<fwd_alloc>,w<wmem_queued>,o<opt_mem>,
.RE .RE
.RE .RE
.br .br
.RS .RS
.RS .RS
o<opt_mem>,bl<back_log>) bl<back_log>,d<sock_drop>)
.RE .RE
.RE .RE
.P .P
@ -146,6 +146,10 @@ The memory used for the sk backlog queue. On a process context, if the
process is receiving packet, and a new packet is received, it will be process is receiving packet, and a new packet is received, it will be
put into the sk backlog queue, so it can be received by the process put into the sk backlog queue, so it can be received by the process
immediately immediately
.P
.TP
.B <sock_drop>
the number of packets dropped before they are de-multiplexed into the socket
.RE .RE
.TP .TP
.B \-p, \-\-processes .B \-p, \-\-processes

3
rdma/res.c
View File

@ -161,6 +161,9 @@ void print_comm(struct rd *rd, const char *str, struct nlattr **nla_line)
{ {
char tmp[18]; char tmp[18];
if (!str)
return;
if (rd->json_output) { if (rd->json_output) {
/* Don't beatify output in JSON format */ /* Don't beatify output in JSON format */
jsonw_string_field(rd->jw, "comm", str); jsonw_string_field(rd->jw, "comm", str);