diff options
-rw-r--r-- | drivers/net/bonding/bond_3ad.c | 6 | ||||
-rw-r--r-- | drivers/net/bonding/bond_3ad.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c index 86f4ba779b5..85cba316d1e 100644 --- a/drivers/net/bonding/bond_3ad.c +++ b/drivers/net/bonding/bond_3ad.c | |||
@@ -1359,9 +1359,9 @@ static void ad_port_selection_logic(struct port *port) | |||
1359 | // update the new aggregator's parameters | 1359 | // update the new aggregator's parameters |
1360 | // if port was responsed from the end-user | 1360 | // if port was responsed from the end-user |
1361 | if (port->actor_oper_port_key & AD_DUPLEX_KEY_BITS) {// if port is full duplex | 1361 | if (port->actor_oper_port_key & AD_DUPLEX_KEY_BITS) {// if port is full duplex |
1362 | port->aggregator->is_individual = 0; | 1362 | port->aggregator->is_individual = false; |
1363 | } else { | 1363 | } else { |
1364 | port->aggregator->is_individual = 1; | 1364 | port->aggregator->is_individual = true; |
1365 | } | 1365 | } |
1366 | 1366 | ||
1367 | port->aggregator->actor_admin_aggregator_key = port->actor_admin_port_key; | 1367 | port->aggregator->actor_admin_aggregator_key = port->actor_admin_port_key; |
@@ -1613,7 +1613,7 @@ static void ad_agg_selection_logic(struct aggregator *agg) | |||
1613 | static void ad_clear_agg(struct aggregator *aggregator) | 1613 | static void ad_clear_agg(struct aggregator *aggregator) |
1614 | { | 1614 | { |
1615 | if (aggregator) { | 1615 | if (aggregator) { |
1616 | aggregator->is_individual = 0; | 1616 | aggregator->is_individual = false; |
1617 | aggregator->actor_admin_aggregator_key = 0; | 1617 | aggregator->actor_admin_aggregator_key = 0; |
1618 | aggregator->actor_oper_aggregator_key = 0; | 1618 | aggregator->actor_oper_aggregator_key = 0; |
1619 | aggregator->partner_system = null_mac_addr; | 1619 | aggregator->partner_system = null_mac_addr; |
diff --git a/drivers/net/bonding/bond_3ad.h b/drivers/net/bonding/bond_3ad.h index 1f822a1d29a..daefd1652d4 100644 --- a/drivers/net/bonding/bond_3ad.h +++ b/drivers/net/bonding/bond_3ad.h | |||
@@ -184,7 +184,7 @@ struct port; | |||
184 | typedef struct aggregator { | 184 | typedef struct aggregator { |
185 | struct mac_addr aggregator_mac_address; | 185 | struct mac_addr aggregator_mac_address; |
186 | u16 aggregator_identifier; | 186 | u16 aggregator_identifier; |
187 | u16 is_individual; // BOOLEAN | 187 | bool is_individual; |
188 | u16 actor_admin_aggregator_key; | 188 | u16 actor_admin_aggregator_key; |
189 | u16 actor_oper_aggregator_key; | 189 | u16 actor_oper_aggregator_key; |
190 | struct mac_addr partner_system; | 190 | struct mac_addr partner_system; |