Changeset 10891

Timestamp:

11/13/08 01:49:37 (5 years ago)

Author:

BrainSlayer

Message:

two duplex modes, one for master, one for slave

Location:

src/linux/xscale/linux-2.6.23

Files:

• drivers/net/bonding/bond_main.c (modified) (6 diffs)
• include/linux/if_bonding.h (modified) (1 diff)

src/linux/xscale/linux-2.6.23/drivers/net/bonding/bond_main.c

@@ -116 +116 @@
                        "1 for active-backup, 2 for balance-xor, "
                        "3 for broadcast, 4 for 802.3ad, 5 for balance-tlb, "
-                       "6 for balance-alb, 7 for weighted-rr, 8 duplex");
+                       "6 for balance-alb, 7 for weighted-rr, 8 duplex-master, 9 duplex-slave");
 module_param(primary, charp, 0);
 MODULE_PARM_DESC(primary, "Primary network device to use");
@@ -166 +166 @@
 {       "balance-alb",          BOND_MODE_ALB},
 {       "weighted-rr",          BOND_MODE_WEIGHTED_RR},
-{       "duplex",               BOND_MODE_DUPLEX},
+{       "duplex-master",                BOND_MODE_DUPLEX},
+{       "duplex-slave",         BOND_MODE_DUPLEX_SLAVE},
 {       NULL,                   -1},
 };
@@ -210 +211 @@
                 return "weighted round robin (weighted-rr)";
         case BOND_MODE_DUPLEX:
-                return "duplex mode";
+                return "duplex master mode";
+        case BOND_MODE_DUPLEX_SLAVE:
+                return "duplex slave mode";
         default:
                 return "unknown";
@@ -4089 +4092 @@
 
 
-static int bond_xmit_duplex(struct sk_buff *skb, struct net_device *bond_dev)
+static int bond_xmit_duplex_master(struct sk_buff *skb, struct net_device *bond_dev)
 {
         struct bonding *bond = bond_dev->priv;
@@ -4113 +4116 @@
         bond_for_each_slave_from(bond, slave, i, start_at) {
                 if ((i % 2) && IS_UP(slave->dev) &&
+                        (slave->link == BOND_LINK_UP) &&
+                    (slave->state == BOND_STATE_ACTIVE)) {
+                        
+                        res = bond_dev_queue_xmit(bond, skb, slave->dev);
+                        write_lock(&bond->curr_slave_lock);
+                        bond->curr_active_slave = slave->next;
+                        write_unlock(&bond->curr_slave_lock);
+
+                        goto out;
+                }
+        }
+out:
+        if (res) {
+                /* no suitable interface, frame not sent */
+                dev_kfree_skb(skb);
+        }
+        read_unlock(&bond->lock);
+        return 0;
+}
+
+static int bond_xmit_duplex_slave(struct sk_buff *skb, struct net_device *bond_dev)
+{
+        struct bonding *bond = bond_dev->priv;
+        struct slave *slave, *start_at;
+        int i;
+        int res = 1;
+
+        read_lock(&bond->lock);
+
+        if (!BOND_IS_OK(bond)) {
+                goto out;
+        }
+
+        read_lock(&bond->curr_slave_lock);
+        slave = start_at = bond->curr_active_slave;
+        read_unlock(&bond->curr_slave_lock);
+
+        if (!slave) {
+                goto out;
+        }
+
+try_send:
+        bond_for_each_slave_from(bond, slave, i, start_at) {
+                if (!(i % 2) && IS_UP(slave->dev) &&
                         (slave->link == BOND_LINK_UP) &&
                     (slave->state == BOND_STATE_ACTIVE)) {
@@ -4293 +4340 @@
                 break;
         case BOND_MODE_DUPLEX:
-                bond_dev->hard_start_xmit = bond_xmit_duplex;
+                bond_dev->hard_start_xmit = bond_xmit_duplex_master;
+                break;
+        case BOND_MODE_DUPLEX_SLAVE:
+                bond_dev->hard_start_xmit = bond_xmit_duplex_slave;
                 break;
         case BOND_MODE_ACTIVEBACKUP:

src/linux/xscale/linux-2.6.23/include/linux/if_bonding.h

@@ -73 +73 @@
 #define BOND_MODE_WEIGHTED_RR   7
 #define BOND_MODE_DUPLEX   8
+#define BOND_MODE_DUPLEX_SLAVE   9
 
 /* each slave's link has 4 states */