Merge branch 'master' into net-next

This commit is contained in:
Stephen Hemminger 2017-10-12 09:06:10 -07:00
commit 4c6080b5c4
1 changed files with 6 additions and 6 deletions

View File

@ -231,7 +231,7 @@ static int netem_parse_opt(struct qdisc_util *qu, int argc, char **argv,
if (!strcmp(*argv, "random")) { if (!strcmp(*argv, "random")) {
NEXT_ARG(); NEXT_ARG();
random_loss_model: random_loss_model:
if (get_percent(&opt.loss, *argv)) { if (get_percent(&opt.loss, *argv)) {
explain1("loss percent"); explain1("loss percent");
return -1; return -1;