diff options
Diffstat (limited to 'drivers/net/bonding/bond_netlink.c')
-rw-r--r-- | drivers/net/bonding/bond_netlink.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c index f847e165d252..5ab3c1847e67 100644 --- a/drivers/net/bonding/bond_netlink.c +++ b/drivers/net/bonding/bond_netlink.c | |||
@@ -56,10 +56,10 @@ static int bond_fill_slave_info(struct sk_buff *skb, | |||
56 | if (nla_put_u16(skb, IFLA_BOND_SLAVE_QUEUE_ID, slave->queue_id)) | 56 | if (nla_put_u16(skb, IFLA_BOND_SLAVE_QUEUE_ID, slave->queue_id)) |
57 | goto nla_put_failure; | 57 | goto nla_put_failure; |
58 | 58 | ||
59 | if (slave->bond->params.mode == BOND_MODE_8023AD) { | 59 | if (BOND_MODE(slave->bond) == BOND_MODE_8023AD) { |
60 | const struct aggregator *agg; | 60 | const struct aggregator *agg; |
61 | 61 | ||
62 | agg = SLAVE_AD_INFO(slave).port.aggregator; | 62 | agg = SLAVE_AD_INFO(slave)->port.aggregator; |
63 | if (agg) | 63 | if (agg) |
64 | if (nla_put_u16(skb, IFLA_BOND_SLAVE_AD_AGGREGATOR_ID, | 64 | if (nla_put_u16(skb, IFLA_BOND_SLAVE_AD_AGGREGATOR_ID, |
65 | agg->aggregator_identifier)) | 65 | agg->aggregator_identifier)) |
@@ -407,7 +407,7 @@ static int bond_fill_info(struct sk_buff *skb, | |||
407 | unsigned int packets_per_slave; | 407 | unsigned int packets_per_slave; |
408 | int i, targets_added; | 408 | int i, targets_added; |
409 | 409 | ||
410 | if (nla_put_u8(skb, IFLA_BOND_MODE, bond->params.mode)) | 410 | if (nla_put_u8(skb, IFLA_BOND_MODE, BOND_MODE(bond))) |
411 | goto nla_put_failure; | 411 | goto nla_put_failure; |
412 | 412 | ||
413 | if (slave_dev && | 413 | if (slave_dev && |
@@ -505,7 +505,7 @@ static int bond_fill_info(struct sk_buff *skb, | |||
505 | bond->params.ad_select)) | 505 | bond->params.ad_select)) |
506 | goto nla_put_failure; | 506 | goto nla_put_failure; |
507 | 507 | ||
508 | if (bond->params.mode == BOND_MODE_8023AD) { | 508 | if (BOND_MODE(bond) == BOND_MODE_8023AD) { |
509 | struct ad_info info; | 509 | struct ad_info info; |
510 | 510 | ||
511 | if (!bond_3ad_get_active_agg_info(bond, &info)) { | 511 | if (!bond_3ad_get_active_agg_info(bond, &info)) { |