patch-2.4.23 linux-2.4.23/drivers/net/bonding/bond_alb.c
Next file: linux-2.4.23/drivers/net/bonding/bond_alb.h
Previous file: linux-2.4.23/drivers/net/b44.c
Back to the patch index
Back to the overall index
- Lines: 215
- Date:
2003-11-28 10:26:20.000000000 -0800
- Orig file:
linux-2.4.22/drivers/net/bonding/bond_alb.c
- Orig date:
2003-08-25 04:44:42.000000000 -0700
diff -urN linux-2.4.22/drivers/net/bonding/bond_alb.c linux-2.4.23/drivers/net/bonding/bond_alb.c
@@ -24,10 +24,15 @@
* 2003/06/25 - Shmulik Hen <shmulik.hen at intel dot com>
* - Fixed signed/unsigned calculation errors that caused load sharing
* to collapse to one slave under very heavy UDP Tx stress.
+ *
+ * 2003/08/06 - Amir Noam <amir.noam at intel dot com>
+ * - Add support for setting bond's MAC address with special
+ * handling required for ALB/TLB.
*/
#include <linux/skbuff.h>
#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
#include <linux/pkt_sched.h>
#include <linux/spinlock.h>
#include <linux/slab.h>
@@ -943,10 +948,11 @@
}
/* hw is a boolean parameter that determines whether we should try and
- * set the hw address of the hw as well as the hw address of the net_device
+ * set the hw address of the device as well as the hw address of the
+ * net_device
*/
static int
-alb_set_mac_addr(struct slave *slave, u8 addr[], int hw)
+alb_set_slave_mac_addr(struct slave *slave, u8 addr[], int hw)
{
struct net_device *dev = NULL;
struct sockaddr s_addr;
@@ -954,16 +960,16 @@
dev = slave->dev;
if (!hw) {
- memcpy(dev->dev_addr, addr, ETH_ALEN);
+ memcpy(dev->dev_addr, addr, dev->addr_len);
return 0;
}
/* for rlb each slave must have a unique hw mac addresses so that */
/* each slave will receive packets destined to a different mac */
- memcpy(s_addr.sa_data, addr, ETH_ALEN);
+ memcpy(s_addr.sa_data, addr, dev->addr_len);
s_addr.sa_family = dev->type;
if (dev->set_mac_address(dev, &s_addr)) {
- printk(KERN_DEBUG "bonding: Error: alb_set_mac_addr:"
+ printk(KERN_DEBUG "bonding: Error: alb_set_slave_mac_addr:"
" dev->set_mac_address of dev %s failed!"
" ALB mode requires that the base driver"
" support setting the hw address also when"
@@ -987,8 +993,8 @@
slaves_state_differ = (SLAVE_IS_OK(slave1) != SLAVE_IS_OK(slave2));
memcpy(tmp_mac_addr, slave1->dev->dev_addr, ETH_ALEN);
- alb_set_mac_addr(slave1, slave2->dev->dev_addr, bond->alb_info.rlb_enabled);
- alb_set_mac_addr(slave2, tmp_mac_addr, bond->alb_info.rlb_enabled);
+ alb_set_slave_mac_addr(slave1, slave2->dev->dev_addr, bond->alb_info.rlb_enabled);
+ alb_set_slave_mac_addr(slave2, tmp_mac_addr, bond->alb_info.rlb_enabled);
/* fasten the change in the switch */
if (SLAVE_IS_OK(slave1)) {
@@ -1153,8 +1159,8 @@
}
if (tmp_slave1) {
- alb_set_mac_addr(slave, tmp_slave1->perm_hwaddr,
- bond->alb_info.rlb_enabled);
+ alb_set_slave_mac_addr(slave, tmp_slave1->perm_hwaddr,
+ bond->alb_info.rlb_enabled);
printk(KERN_WARNING "bonding: Warning: the hw address "
"of slave %s is in use by the bond; "
@@ -1172,6 +1178,67 @@
return 0;
}
+/**
+ * alb_set_mac_address
+ * @bond:
+ * @addr:
+ *
+ * In TLB mode all slaves are configured to the bond's hw address, but set
+ * their dev_addr field to different addresses (based on their permanent hw
+ * addresses).
+ *
+ * For each slave, this function sets the interface to the new address and then
+ * changes its dev_addr field to its previous value.
+ *
+ * Unwinding assumes bond's mac address has not yet changed.
+ */
+static inline int
+alb_set_mac_address(struct bonding *bond, void *addr)
+{
+ struct sockaddr sa;
+ struct slave *slave;
+ char tmp_addr[ETH_ALEN];
+ int error;
+
+ if (bond->alb_info.rlb_enabled) {
+ return 0;
+ }
+
+ slave = bond_get_first_slave(bond);
+ for (; slave; slave = bond_get_next_slave(bond, slave)) {
+ if (slave->dev->set_mac_address == NULL) {
+ error = -EOPNOTSUPP;
+ goto unwind;
+ }
+
+ /* save net_device's current hw address */
+ memcpy(tmp_addr, slave->dev->dev_addr, ETH_ALEN);
+
+ error = slave->dev->set_mac_address(slave->dev, addr);
+
+ /* restore net_device's hw address */
+ memcpy(slave->dev->dev_addr, tmp_addr, ETH_ALEN);
+
+ if (error) {
+ goto unwind;
+ }
+ }
+
+ return 0;
+
+unwind:
+ memcpy(sa.sa_data, bond->device->dev_addr, bond->device->addr_len);
+ sa.sa_family = bond->device->type;
+ slave = bond_get_first_slave(bond);
+ for (; slave; slave = bond_get_next_slave(bond, slave)) {
+ memcpy(tmp_addr, slave->dev->dev_addr, ETH_ALEN);
+ slave->dev->set_mac_address(slave->dev, &sa);
+ memcpy(slave->dev->dev_addr, tmp_addr, ETH_ALEN);
+ }
+
+ return error;
+}
+
/************************ exported alb funcions ************************/
int
@@ -1442,8 +1509,8 @@
{
int err = 0;
- err = alb_set_mac_addr(slave, slave->perm_hwaddr,
- bond->alb_info.rlb_enabled);
+ err = alb_set_slave_mac_addr(slave, slave->perm_hwaddr,
+ bond->alb_info.rlb_enabled);
if (err) {
return err;
}
@@ -1567,10 +1634,61 @@
alb_swap_mac_addr(bond, swap_slave, new_slave);
} else {
/* set the new_slave to the bond mac address */
- alb_set_mac_addr(new_slave, bond->device->dev_addr,
- bond->alb_info.rlb_enabled);
+ alb_set_slave_mac_addr(new_slave, bond->device->dev_addr,
+ bond->alb_info.rlb_enabled);
/* fasten bond mac on new current slave */
alb_send_learning_packets(new_slave, bond->device->dev_addr);
}
}
+int
+bond_alb_set_mac_address(struct net_device *dev, void *addr)
+{
+ struct bonding *bond = dev->priv;
+ struct sockaddr *sa = addr;
+ struct slave *swap_slave = NULL;
+ int error = 0;
+
+ if (!is_valid_ether_addr(sa->sa_data)) {
+ return -EADDRNOTAVAIL;
+ }
+
+ error = alb_set_mac_address(bond, addr);
+ if (error) {
+ return error;
+ }
+
+ memcpy(dev->dev_addr, sa->sa_data, dev->addr_len);
+
+ /* If there is no current_slave there is nothing else to do.
+ * Otherwise we'll need to pass the new address to it and handle
+ * duplications.
+ */
+ if (bond->current_slave == NULL) {
+ return 0;
+ }
+
+ swap_slave = bond_get_first_slave(bond);
+ while (swap_slave) {
+ if (!memcmp(swap_slave->dev->dev_addr, dev->dev_addr, ETH_ALEN)) {
+ break;
+ }
+ swap_slave = bond_get_next_slave(bond, swap_slave);
+ }
+
+ if (swap_slave) {
+ alb_swap_mac_addr(bond, swap_slave, bond->current_slave);
+ } else {
+ alb_set_slave_mac_addr(bond->current_slave, dev->dev_addr,
+ bond->alb_info.rlb_enabled);
+
+ alb_send_learning_packets(bond->current_slave, dev->dev_addr);
+ if (bond->alb_info.rlb_enabled) {
+ /* inform clients mac address has changed */
+ rlb_req_update_slave_clients(bond, bond->current_slave);
+ }
+ }
+
+ return 0;
+}
+
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)