leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net/bonding: Enable bonding to enslave netdevices not supporting set_mac_address()

Browse Source 
This patch allows for enslaving netdevices which do not support
the set_mac_address() function. In that case the bond mac address is the one
of the active slave, where remote peers are notified on the mac address
(neighbour) change by Gratuitous ARP sent by bonding when fail-over occurs
(this is already done by the bonding code).

Signed-off-by: Moni Shoua <monis at voltaire.com>
Signed-off-by: Or Gerlitz <ogerlitz at voltaire.com>
Acked-by: Jay Vosburgh <fubar@us.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Moni Shoua 2007-10-09 19:43:39 -07:00 committed by Jeff Garzik
parent 872254dd6b
commit 2ab82852a2
2 changed files with 60 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
drivers/net/bonding/bond_main.c
View File

@ -1096,6 +1096,14 @@ void bond_change_active_slave(struct bonding *bond, struct slave *new_active)
if (new_active) { if (new_active) {
bond_set_slave_active_flags(new_active); bond_set_slave_active_flags(new_active);
} }
/* when bonding does not set the slave MAC address, the bond MAC
* address is the one of the active slave.
*/
if (new_active && !bond->do_set_mac_addr)
memcpy(bond->dev->dev_addr, new_active->dev->dev_addr,
new_active->dev->addr_len);
bond_send_gratuitous_arp(bond); bond_send_gratuitous_arp(bond);
} }
} }
@ -1346,13 +1354,22 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
} }
if (slave_dev->set_mac_address == NULL) { if (slave_dev->set_mac_address == NULL) {
printk(KERN_ERR DRV_NAME if (bond->slave_cnt == 0) {
": %s: Error: The slave device you specified does " printk(KERN_WARNING DRV_NAME
"not support setting the MAC address. " ": %s: Warning: The first slave device you "
"Your kernel likely does not support slave " "specified does not support setting the MAC "
"devices.\n", bond_dev->name); "address. This bond MAC address would be that "
res = -EOPNOTSUPP; "of the active slave.\n", bond_dev->name);
goto err_undo_flags; bond->do_set_mac_addr = 0;
} else if (bond->do_set_mac_addr) {
printk(KERN_ERR DRV_NAME
": %s: Error: The slave device you specified "
"does not support setting the MAC addres,."
"but this bond uses this practice. \n"
, bond_dev->name);
res = -EOPNOTSUPP;
goto err_undo_flags;
}
} }
new_slave = kzalloc(sizeof(struct slave), GFP_KERNEL); new_slave = kzalloc(sizeof(struct slave), GFP_KERNEL);
@ -1373,16 +1390,18 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
*/ */
memcpy(new_slave->perm_hwaddr, slave_dev->dev_addr, ETH_ALEN); memcpy(new_slave->perm_hwaddr, slave_dev->dev_addr, ETH_ALEN);
/* if (bond->do_set_mac_addr) {
* Set slave to master's mac address. The application already /*
* set the master's mac address to that of the first slave * Set slave to master's mac address. The application already
*/ * set the master's mac address to that of the first slave
memcpy(addr.sa_data, bond_dev->dev_addr, bond_dev->addr_len); */
addr.sa_family = slave_dev->type; memcpy(addr.sa_data, bond_dev->dev_addr, bond_dev->addr_len);
res = dev_set_mac_address(slave_dev, &addr); addr.sa_family = slave_dev->type;
if (res) { res = dev_set_mac_address(slave_dev, &addr);
dprintk("Error %d calling set_mac_address\n", res); if (res) {
goto err_free; dprintk("Error %d calling set_mac_address\n", res);
goto err_free;
}
} }
res = netdev_set_master(slave_dev, bond_dev); res = netdev_set_master(slave_dev, bond_dev);
@ -1607,9 +1626,11 @@ err_close:
dev_close(slave_dev); dev_close(slave_dev);
err_restore_mac: err_restore_mac:
memcpy(addr.sa_data, new_slave->perm_hwaddr, ETH_ALEN); if (bond->do_set_mac_addr) {
addr.sa_family = slave_dev->type; memcpy(addr.sa_data, new_slave->perm_hwaddr, ETH_ALEN);
dev_set_mac_address(slave_dev, &addr); addr.sa_family = slave_dev->type;
dev_set_mac_address(slave_dev, &addr);
}
err_free: err_free:
kfree(new_slave); kfree(new_slave);
@ -1782,10 +1803,12 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
/* close slave before restoring its mac address */ /* close slave before restoring its mac address */
dev_close(slave_dev); dev_close(slave_dev);
/* restore original ("permanent") mac address */ if (bond->do_set_mac_addr) {
memcpy(addr.sa_data, slave->perm_hwaddr, ETH_ALEN); /* restore original ("permanent") mac address */
addr.sa_family = slave_dev->type; memcpy(addr.sa_data, slave->perm_hwaddr, ETH_ALEN);
dev_set_mac_address(slave_dev, &addr); addr.sa_family = slave_dev->type;
dev_set_mac_address(slave_dev, &addr);
}
slave_dev->priv_flags &= ~(IFF_MASTER_8023AD | IFF_MASTER_ALB | slave_dev->priv_flags &= ~(IFF_MASTER_8023AD | IFF_MASTER_ALB |
IFF_SLAVE_INACTIVE | IFF_BONDING | IFF_SLAVE_INACTIVE | IFF_BONDING |
@ -1872,10 +1895,12 @@ static int bond_release_all(struct net_device *bond_dev)
/* close slave before restoring its mac address */ /* close slave before restoring its mac address */
dev_close(slave_dev); dev_close(slave_dev);
/* restore original ("permanent") mac address*/ if (bond->do_set_mac_addr) {
memcpy(addr.sa_data, slave->perm_hwaddr, ETH_ALEN); /* restore original ("permanent") mac address*/
addr.sa_family = slave_dev->type; memcpy(addr.sa_data, slave->perm_hwaddr, ETH_ALEN);
dev_set_mac_address(slave_dev, &addr); addr.sa_family = slave_dev->type;
dev_set_mac_address(slave_dev, &addr);
}
slave_dev->priv_flags &= ~(IFF_MASTER_8023AD | IFF_MASTER_ALB | slave_dev->priv_flags &= ~(IFF_MASTER_8023AD | IFF_MASTER_ALB |
IFF_SLAVE_INACTIVE); IFF_SLAVE_INACTIVE);
@ -3913,6 +3938,9 @@ static int bond_set_mac_address(struct net_device *bond_dev, void *addr)
dprintk("bond=%p, name=%s\n", bond, (bond_dev ? bond_dev->name : "None")); dprintk("bond=%p, name=%s\n", bond, (bond_dev ? bond_dev->name : "None"));
if (!bond->do_set_mac_addr)
return -EOPNOTSUPP;
if (!is_valid_ether_addr(sa->sa_data)) { if (!is_valid_ether_addr(sa->sa_data)) {
return -EADDRNOTAVAIL; return -EADDRNOTAVAIL;
} }
@ -4299,6 +4327,9 @@ static int bond_init(struct net_device *bond_dev, struct bond_params *params)
bond_create_proc_entry(bond); bond_create_proc_entry(bond);
#endif #endif
/* set do_set_mac_addr to true on startup */
bond->do_set_mac_addr = 1;
list_add_tail(&bond->bond_list, &bond_dev_list); list_add_tail(&bond->bond_list, &bond_dev_list);
return 0; return 0;

1
drivers/net/bonding/bonding.h
View File

@ -185,6 +185,7 @@ struct bonding {
struct timer_list mii_timer; struct timer_list mii_timer;
struct timer_list arp_timer; struct timer_list arp_timer;
s8 kill_timers; s8 kill_timers;
s8 do_set_mac_addr;
struct net_device_stats stats; struct net_device_stats stats;
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
struct proc_dir_entry *proc_entry; struct proc_dir_entry *proc_entry;