Commit 415d3942 authored by Tonghao Zhang's avatar Tonghao Zhang Committed by David S. Miller

bonding: check slave set command firstly

This patch is a little improvement. If user use the
command shown as below, we should print the info [1]
instead of [2]. The eth0 exists actually, and it may
confuse user.

$ echo "eth0" > /sys/class/net/bond4/bonding/slaves

[1] "bond4: no command found in slaves file - use +ifname or -ifname"
[2] "write error: No such device"
Signed-off-by: default avatarTonghao Zhang <xiangxia.m.yue@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 79e08823
...@@ -1375,6 +1375,7 @@ static int bond_option_slaves_set(struct bonding *bond, ...@@ -1375,6 +1375,7 @@ static int bond_option_slaves_set(struct bonding *bond,
sscanf(newval->string, "%16s", command); /* IFNAMSIZ*/ sscanf(newval->string, "%16s", command); /* IFNAMSIZ*/
ifname = command + 1; ifname = command + 1;
if ((strlen(command) <= 1) || if ((strlen(command) <= 1) ||
(command[0] != '+' && command[0] != '-') ||
!dev_valid_name(ifname)) !dev_valid_name(ifname))
goto err_no_cmd; goto err_no_cmd;
...@@ -1398,6 +1399,7 @@ static int bond_option_slaves_set(struct bonding *bond, ...@@ -1398,6 +1399,7 @@ static int bond_option_slaves_set(struct bonding *bond,
break; break;
default: default:
/* should not run here. */
goto err_no_cmd; goto err_no_cmd;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment