diff options
| author |   Nikolay Aleksandrov <nikolay@redhat.com> | 2014-01-22 14:53:17 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-01-22 15:38:41 -0800 |
| commit | 2b3798d5e1377ce6c67993bb271754c9c5ab4833 (patch) | |
| tree | 29e37d916f2312c62d9e2f46a6cbe54125e1f3bb /drivers/net/bonding/bond_netlink.c | |
| parent | bonding: add infrastructure for an option API (diff) | |
| download | linux-dev-2b3798d5e1377ce6c67993bb271754c9c5ab4833.tar.xz linux-dev-2b3798d5e1377ce6c67993bb271754c9c5ab4833.zip | |
bonding: convert mode setting to use the new option API
This patch makes the bond's mode setting use the new option API and
adds support for dependency printing which relies on having an entry for
the mode option in the bond_opts[] array.
Also add the ability to print the mode name when mode dependency fails
and fix some trivial/style errors.
Signed-off-by: Nikolay Aleksandrov <nikolay@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding/bond_netlink.c')
| -rw-r--r-- | drivers/net/bonding/bond_netlink.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c index e8526552790c..db3f672a5e2a 100644 --- a/drivers/net/bonding/bond_netlink.c +++ b/drivers/net/bonding/bond_netlink.c @@ -98,6 +98,7 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[], struct nlattr *data[]) { struct bonding *bond = netdev_priv(bond_dev); + struct bond_opt_value newval; int miimon = 0; int err; @@ -107,7 +108,8 @@ static int bond_changelink(struct net_device *bond_dev, if (data[IFLA_BOND_MODE]) { int mode = nla_get_u8(data[IFLA_BOND_MODE]); - err = bond_option_mode_set(bond, mode); + bond_opt_initval(&newval, mode); + err = __bond_opt_set(bond, BOND_OPT_MODE, &newval); if (err) return err; } |