1 diff -Nurp linux-2.6.22.19-vs2.3.0.34/drivers/net/bonding/bond_main.c linux-2.6.22.19-vs2.3.0.34.bond1/drivers/net/bonding/bond_main.c
2 --- linux-2.6.22.19-vs2.3.0.34/drivers/net/bonding/bond_main.c 2007-09-05 07:07:59.000000000 +0200
3 +++ linux-2.6.22.19-vs2.3.0.34.bond1/drivers/net/bonding/bond_main.c 2009-06-23 00:51:24.000000000 +0200
4 @@ -123,7 +123,7 @@ MODULE_PARM_DESC(lacp_rate, "LACPDU tx r
6 module_param(xmit_hash_policy, charp, 0);
7 MODULE_PARM_DESC(xmit_hash_policy, "XOR hashing method: 0 for layer 2 (default)"
8 - ", 1 for layer 3+4");
9 + ", 1 for layer 3+4, 2 for layer2+3");
10 module_param(arp_interval, int, 0);
11 MODULE_PARM_DESC(arp_interval, "arp interval in milliseconds");
12 module_param_array(arp_ip_target, charp, NULL, 0);
13 @@ -170,6 +170,7 @@ struct bond_parm_tbl bond_mode_tbl[] = {
14 struct bond_parm_tbl xmit_hashtype_tbl[] = {
15 { "layer2", BOND_XMIT_POLICY_LAYER2},
16 { "layer3+4", BOND_XMIT_POLICY_LAYER34},
17 +{ "layer2+3", BOND_XMIT_POLICY_LAYER23},
21 @@ -3447,6 +3448,24 @@ void bond_unregister_arp(struct bonding
24 /*---------------------------- Hashing Policies -----------------------------*/
27 + * Hash for the output device based upon layer 2 and layer 3 data. If
28 + * the packet is not IP mimic bond_xmit_hash_policy_l2()
30 +static int bond_xmit_hash_policy_l23(struct sk_buff *skb,
31 + struct net_device *bond_dev, int count)
33 + struct ethhdr *data = (struct ethhdr *)skb->data;
34 + struct iphdr *iph = ip_hdr(skb);
36 + if (skb->protocol == __constant_htons(ETH_P_IP)) {
37 + return ((ntohl(iph->saddr ^ iph->daddr) & 0xffff) ^
38 + (data->h_dest[5] ^ bond_dev->dev_addr[5])) % count;
41 + return (data->h_dest[5] ^ bond_dev->dev_addr[5]) % count;
45 * Hash for the output device based upon layer 3 and layer 4 data. If
46 @@ -4183,6 +4202,8 @@ void bond_set_mode_ops(struct bonding *b
47 bond_dev->hard_start_xmit = bond_xmit_xor;
48 if (bond->params.xmit_policy == BOND_XMIT_POLICY_LAYER34)
49 bond->xmit_hash_policy = bond_xmit_hash_policy_l34;
50 + else if (bond->params.xmit_policy == BOND_XMIT_POLICY_LAYER23)
51 + bond->xmit_hash_policy = bond_xmit_hash_policy_l23;
53 bond->xmit_hash_policy = bond_xmit_hash_policy_l2;
55 @@ -4194,6 +4215,8 @@ void bond_set_mode_ops(struct bonding *b
56 bond_dev->hard_start_xmit = bond_3ad_xmit_xor;
57 if (bond->params.xmit_policy == BOND_XMIT_POLICY_LAYER34)
58 bond->xmit_hash_policy = bond_xmit_hash_policy_l34;
59 + else if (bond->params.xmit_policy == BOND_XMIT_POLICY_LAYER23)
60 + bond->xmit_hash_policy = bond_xmit_hash_policy_l23;
62 bond->xmit_hash_policy = bond_xmit_hash_policy_l2;
64 diff -Nurp linux-2.6.22.19-vs2.3.0.34/include/linux/if_bonding.h linux-2.6.22.19-vs2.3.0.34.bond1/include/linux/if_bonding.h
65 --- linux-2.6.22.19-vs2.3.0.34/include/linux/if_bonding.h 2006-06-18 03:49:35.000000000 +0200
66 +++ linux-2.6.22.19-vs2.3.0.34.bond1/include/linux/if_bonding.h 2009-06-23 00:49:47.000000000 +0200
69 #define BOND_XMIT_POLICY_LAYER2 0 /* layer 2 (MAC only), default */
70 #define BOND_XMIT_POLICY_LAYER34 1 /* layer 3+4 (IP ^ MAC) */
71 +#define BOND_XMIT_POLICY_LAYER23 2 /* layer 2+3 (IP ^ MAC) */
73 typedef struct ifbond {