Commit 58402054 authored by Holger Eitzenberger's avatar Holger Eitzenberger Committed by David S. Miller
Browse files

bonding: add and use bond_is_lb()



Introduce and use bond_is_lb(), it is usefull to shorten the repetitive
check for either ALB or TLB mode.

Signed-off-by: default avatarHolger Eitzenberger <holger@eitzenberger.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 512bb43e
...@@ -294,10 +294,8 @@ static int bond_del_vlan(struct bonding *bond, unsigned short vlan_id) ...@@ -294,10 +294,8 @@ static int bond_del_vlan(struct bonding *bond, unsigned short vlan_id)
if (vlan->vlan_id == vlan_id) { if (vlan->vlan_id == vlan_id) {
list_del(&vlan->vlan_list); list_del(&vlan->vlan_list);
if ((bond->params.mode == BOND_MODE_TLB) || if (bond_is_lb(bond))
(bond->params.mode == BOND_MODE_ALB)) {
bond_alb_clear_vlan(bond, vlan_id); bond_alb_clear_vlan(bond, vlan_id);
}
dprintk("removed VLAN ID %d from bond %s\n", vlan_id, dprintk("removed VLAN ID %d from bond %s\n", vlan_id,
bond->dev->name); bond->dev->name);
...@@ -1174,10 +1172,8 @@ void bond_change_active_slave(struct bonding *bond, struct slave *new_active) ...@@ -1174,10 +1172,8 @@ void bond_change_active_slave(struct bonding *bond, struct slave *new_active)
bond_3ad_handle_link_change(new_active, BOND_LINK_UP); bond_3ad_handle_link_change(new_active, BOND_LINK_UP);
} }
if ((bond->params.mode == BOND_MODE_TLB) || if (bond_is_lb(bond))
(bond->params.mode == BOND_MODE_ALB)) {
bond_alb_handle_link_change(bond, new_active, BOND_LINK_UP); bond_alb_handle_link_change(bond, new_active, BOND_LINK_UP);
}
} else { } else {
if (USES_PRIMARY(bond->params.mode)) { if (USES_PRIMARY(bond->params.mode)) {
printk(KERN_INFO DRV_NAME printk(KERN_INFO DRV_NAME
...@@ -1192,8 +1188,7 @@ void bond_change_active_slave(struct bonding *bond, struct slave *new_active) ...@@ -1192,8 +1188,7 @@ void bond_change_active_slave(struct bonding *bond, struct slave *new_active)
bond_mc_swap(bond, new_active, old_active); bond_mc_swap(bond, new_active, old_active);
} }
if ((bond->params.mode == BOND_MODE_TLB) || if (bond_is_lb(bond)) {
(bond->params.mode == BOND_MODE_ALB)) {
bond_alb_handle_active_change(bond, new_active); bond_alb_handle_active_change(bond, new_active);
if (old_active) if (old_active)
bond_set_slave_inactive_flags(old_active); bond_set_slave_inactive_flags(old_active);
...@@ -1554,8 +1549,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) ...@@ -1554,8 +1549,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
new_slave->dev = slave_dev; new_slave->dev = slave_dev;
slave_dev->priv_flags |= IFF_BONDING; slave_dev->priv_flags |= IFF_BONDING;
if ((bond->params.mode == BOND_MODE_TLB) || if (bond_is_lb(bond)) {
(bond->params.mode == BOND_MODE_ALB)) {
/* bond_alb_init_slave() must be called before all other stages since /* bond_alb_init_slave() must be called before all other stages since
* it might fail and we do not want to have to undo everything * it might fail and we do not want to have to undo everything
*/ */
...@@ -1871,8 +1865,7 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev) ...@@ -1871,8 +1865,7 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
bond_change_active_slave(bond, NULL); bond_change_active_slave(bond, NULL);
} }
if ((bond->params.mode == BOND_MODE_TLB) || if (bond_is_lb(bond)) {
(bond->params.mode == BOND_MODE_ALB)) {
/* Must be called only after the slave has been /* Must be called only after the slave has been
* detached from the list and the curr_active_slave * detached from the list and the curr_active_slave
* has been cleared (if our_slave == old_current), * has been cleared (if our_slave == old_current),
...@@ -2061,8 +2054,7 @@ static int bond_release_all(struct net_device *bond_dev) ...@@ -2061,8 +2054,7 @@ static int bond_release_all(struct net_device *bond_dev)
*/ */
write_unlock_bh(&bond->lock); write_unlock_bh(&bond->lock);
if ((bond->params.mode == BOND_MODE_TLB) || if (bond_is_lb(bond)) {
(bond->params.mode == BOND_MODE_ALB)) {
/* must be called only after the slave /* must be called only after the slave
* has been detached from the list * has been detached from the list
*/ */
...@@ -2389,8 +2381,7 @@ static void bond_miimon_commit(struct bonding *bond) ...@@ -2389,8 +2381,7 @@ static void bond_miimon_commit(struct bonding *bond)
if (bond->params.mode == BOND_MODE_8023AD) if (bond->params.mode == BOND_MODE_8023AD)
bond_3ad_handle_link_change(slave, BOND_LINK_UP); bond_3ad_handle_link_change(slave, BOND_LINK_UP);
if ((bond->params.mode == BOND_MODE_TLB) || if (bond_is_lb(bond))
(bond->params.mode == BOND_MODE_ALB))
bond_alb_handle_link_change(bond, slave, bond_alb_handle_link_change(bond, slave,
BOND_LINK_UP); BOND_LINK_UP);
...@@ -3796,8 +3787,7 @@ static int bond_open(struct net_device *bond_dev) ...@@ -3796,8 +3787,7 @@ static int bond_open(struct net_device *bond_dev)
bond->kill_timers = 0; bond->kill_timers = 0;
if ((bond->params.mode == BOND_MODE_TLB) || if (bond_is_lb(bond)) {
(bond->params.mode == BOND_MODE_ALB)) {
/* bond_alb_initialize must be called before the timer /* bond_alb_initialize must be called before the timer
* is started. * is started.
*/ */
...@@ -3882,8 +3872,7 @@ static int bond_close(struct net_device *bond_dev) ...@@ -3882,8 +3872,7 @@ static int bond_close(struct net_device *bond_dev)
} }
if ((bond->params.mode == BOND_MODE_TLB) || if (bond_is_lb(bond)) {
(bond->params.mode == BOND_MODE_ALB)) {
/* Must be called only after all /* Must be called only after all
* slaves have been released * slaves have been released
*/ */
......
...@@ -260,6 +260,12 @@ static inline struct bonding *bond_get_bond_by_slave(struct slave *slave) ...@@ -260,6 +260,12 @@ static inline struct bonding *bond_get_bond_by_slave(struct slave *slave)
return (struct bonding *)netdev_priv(slave->dev->master); return (struct bonding *)netdev_priv(slave->dev->master);
} }
static inline bool bond_is_lb(const struct bonding *bond)
{
return bond->params.mode == BOND_MODE_TLB
|| bond->params.mode == BOND_MODE_ALB;
}
#define BOND_FOM_NONE 0 #define BOND_FOM_NONE 0
#define BOND_FOM_ACTIVE 1 #define BOND_FOM_ACTIVE 1
#define BOND_FOM_FOLLOW 2 #define BOND_FOM_FOLLOW 2
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment