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

Merge branch 'master' into net-next

This commit is contained in:
Stephen Hemminger 2015-08-10 11:27:35 -07:00
parent d02e46627f 7f9dddbe7d
commit e4a852f8c8
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
misc/ss.c
View File

@ -3664,6 +3664,8 @@ int main(int argc, char *argv[])
char *p, *p1; char *p, *p1;
if (!saw_query) { if (!saw_query) {
current_filter.dbs = 0; current_filter.dbs = 0;
state_filter = state_filter ?
state_filter : SS_CONN;
saw_query = 1; saw_query = 1;
do_default = 0; do_default = 0;
} }

8
tipc/bearer.c
View File

@ -412,7 +412,7 @@ static int cmd_bearer_disable(struct nlmsghdr *nlh, const struct cmd *cmd,
static void cmd_bearer_set_help(struct cmdl *cmdl) static void cmd_bearer_set_help(struct cmdl *cmdl)
{ {
fprintf(stderr, "Usage: %s bearer set [OPTIONS] media MEDIA ARGS...\n", fprintf(stderr, "Usage: %s bearer set OPTION media MEDIA ARGS...\n",
cmdl->argv[0]); cmdl->argv[0]);
_print_bearer_opts(); _print_bearer_opts();
_print_bearer_media(); _print_bearer_media();
@ -420,7 +420,7 @@ static void cmd_bearer_set_help(struct cmdl *cmdl)
static void cmd_bearer_set_udp_help(struct cmdl *cmdl) static void cmd_bearer_set_udp_help(struct cmdl *cmdl)
{ {
fprintf(stderr, "Usage: %s bearer set [OPTIONS] media udp name NAME\n\n", fprintf(stderr, "Usage: %s bearer set OPTION media udp name NAME\n\n",
cmdl->argv[0]); cmdl->argv[0]);
_print_bearer_opts(); _print_bearer_opts();
} }
@ -528,7 +528,7 @@ static int cmd_bearer_set(struct nlmsghdr *nlh, const struct cmd *cmd,
static void cmd_bearer_get_help(struct cmdl *cmdl) static void cmd_bearer_get_help(struct cmdl *cmdl)
{ {
fprintf(stderr, "Usage: %s bearer get [OPTIONS] media MEDIA ARGS...\n", fprintf(stderr, "Usage: %s bearer get OPTION media MEDIA ARGS...\n",
cmdl->argv[0]); cmdl->argv[0]);
_print_bearer_opts(); _print_bearer_opts();
_print_bearer_media(); _print_bearer_media();
@ -536,7 +536,7 @@ static void cmd_bearer_get_help(struct cmdl *cmdl)
static void cmd_bearer_get_udp_help(struct cmdl *cmdl) static void cmd_bearer_get_udp_help(struct cmdl *cmdl)
{ {
fprintf(stderr, "Usage: %s bearer get [OPTIONS] media udp name NAME\n\n", fprintf(stderr, "Usage: %s bearer get OPTION media udp name NAME\n\n",
cmdl->argv[0]); cmdl->argv[0]);
_print_bearer_opts(); _print_bearer_opts();
} }