diff options
author | Jiri Pirko <jiri@resnulli.us> | 2014-09-05 05:36:34 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-09-06 00:44:03 -0400 |
commit | cea6aeb6979f6409cacd6900d237cb4ed39fd6d2 (patch) | |
tree | 05eb0d0ea2966abd15de3ce4622967830d1bef69 /drivers/net/bonding | |
parent | 3aff50170a37d032c86d10c1815e875e8af0aa1a (diff) |
bonding: add slave netlink policy and put slave-related ops together
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Acked-by: Nikolay Aleksandrov <nikolay@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding')
-rw-r--r-- | drivers/net/bonding/bond_netlink.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c index 1570deab112e..e1489d9df2a4 100644 --- a/drivers/net/bonding/bond_netlink.c +++ b/drivers/net/bonding/bond_netlink.c | |||
@@ -96,6 +96,10 @@ static const struct nla_policy bond_policy[IFLA_BOND_MAX + 1] = { | |||
96 | [IFLA_BOND_AD_INFO] = { .type = NLA_NESTED }, | 96 | [IFLA_BOND_AD_INFO] = { .type = NLA_NESTED }, |
97 | }; | 97 | }; |
98 | 98 | ||
99 | static const struct nla_policy bond_slave_policy[IFLA_BOND_SLAVE_MAX + 1] = { | ||
100 | [IFLA_BOND_SLAVE_QUEUE_ID] = { .type = NLA_U16 }, | ||
101 | }; | ||
102 | |||
99 | static int bond_validate(struct nlattr *tb[], struct nlattr *data[]) | 103 | static int bond_validate(struct nlattr *tb[], struct nlattr *data[]) |
100 | { | 104 | { |
101 | if (tb[IFLA_ADDRESS]) { | 105 | if (tb[IFLA_ADDRESS]) { |
@@ -580,17 +584,18 @@ struct rtnl_link_ops bond_link_ops __read_mostly = { | |||
580 | .priv_size = sizeof(struct bonding), | 584 | .priv_size = sizeof(struct bonding), |
581 | .setup = bond_setup, | 585 | .setup = bond_setup, |
582 | .maxtype = IFLA_BOND_MAX, | 586 | .maxtype = IFLA_BOND_MAX, |
583 | .slave_maxtype = IFLA_BOND_SLAVE_MAX, | ||
584 | .policy = bond_policy, | 587 | .policy = bond_policy, |
585 | .validate = bond_validate, | 588 | .validate = bond_validate, |
586 | .newlink = bond_newlink, | 589 | .newlink = bond_newlink, |
587 | .changelink = bond_changelink, | 590 | .changelink = bond_changelink, |
588 | .slave_changelink = bond_slave_changelink, | ||
589 | .get_size = bond_get_size, | 591 | .get_size = bond_get_size, |
590 | .fill_info = bond_fill_info, | 592 | .fill_info = bond_fill_info, |
591 | .get_num_tx_queues = bond_get_num_tx_queues, | 593 | .get_num_tx_queues = bond_get_num_tx_queues, |
592 | .get_num_rx_queues = bond_get_num_tx_queues, /* Use the same number | 594 | .get_num_rx_queues = bond_get_num_tx_queues, /* Use the same number |
593 | as for TX queues */ | 595 | as for TX queues */ |
596 | .slave_maxtype = IFLA_BOND_SLAVE_MAX, | ||
597 | .slave_policy = bond_slave_policy, | ||
598 | .slave_changelink = bond_slave_changelink, | ||
594 | .get_slave_size = bond_get_slave_size, | 599 | .get_slave_size = bond_get_slave_size, |
595 | .fill_slave_info = bond_fill_slave_info, | 600 | .fill_slave_info = bond_fill_slave_info, |
596 | }; | 601 | }; |