aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJiri Pirko <jiri@resnulli.us>2014-01-22 03:05:54 -0500
committerDavid S. Miller <davem@davemloft.net>2014-01-23 00:57:05 -0500
commitdf7dbcbbafc0b8f3fb31a40c6f3c4a7e15cb0b40 (patch)
tree4df36f32c23aac6895c62b147f0305036a3c8b0a /net
parent0a9099f8836cd5f91f811078b367e0227e0a20f6 (diff)
rtnetlink: put "BOND" into nl attribute names which are related to bonding
Signed-off-by: Jiri Pirko <jiri@resnulli.us> Acked-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/rtnetlink.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 4f85de7aca33..cace14962234 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -725,13 +725,13 @@ static size_t rtnl_bond_slave_size(const struct net_device *dev)
725{ 725{
726 struct net_device *bond; 726 struct net_device *bond;
727 size_t slave_size = 727 size_t slave_size =
728 nla_total_size(sizeof(struct nlattr)) + /* IFLA_SLAVE */ 728 nla_total_size(sizeof(struct nlattr)) + /* IFLA_BOND_SLAVE */
729 nla_total_size(1) + /* IFLA_SLAVE_STATE */ 729 nla_total_size(1) + /* IFLA_BOND_SLAVE_STATE */
730 nla_total_size(1) + /* IFLA_SLAVE_MII_STATUS */ 730 nla_total_size(1) + /* IFLA_BOND_SLAVE_MII_STATUS */
731 nla_total_size(4) + /* IFLA_SLAVE_LINK_FAILURE_COUNT */ 731 nla_total_size(4) + /* IFLA_BOND_SLAVE_LINK_FAILURE_COUNT */
732 nla_total_size(MAX_ADDR_LEN) + /* IFLA_SLAVE_PERM_HWADDR */ 732 nla_total_size(MAX_ADDR_LEN) + /* IFLA_BOND_SLAVE_PERM_HWADDR */
733 nla_total_size(2) + /* IFLA_SLAVE_QUEUE_ID */ 733 nla_total_size(2) + /* IFLA_BOND_SLAVE_QUEUE_ID */
734 nla_total_size(2) + /* IFLA_SLAVE_AD_AGGREGATOR_ID */ 734 nla_total_size(2) + /* IFLA_BOND_SLAVE_AD_AGGREGATOR_ID */
735 0; 735 0;
736 736
737 if (netif_is_bond_slave((struct net_device *)dev)) { 737 if (netif_is_bond_slave((struct net_device *)dev)) {
@@ -883,7 +883,7 @@ static size_t rtnl_bond_slave_fill(struct sk_buff *skb, struct net_device *dev)
883 if (!bond || !bond->netdev_ops->ndo_get_slave) 883 if (!bond || !bond->netdev_ops->ndo_get_slave)
884 return 0; 884 return 0;
885 885
886 nest = nla_nest_start(skb, IFLA_SLAVE); 886 nest = nla_nest_start(skb, IFLA_BOND_SLAVE);
887 if (!nest) 887 if (!nest)
888 return -EMSGSIZE; 888 return -EMSGSIZE;
889 889