diff options
author | Paul Mackerras <paulus@samba.org> | 2007-12-10 15:41:22 +1100 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-12-10 15:41:22 +1100 |
commit | b242a60206881559bb3102110048762422e6b74e (patch) | |
tree | 86459efa47b9c3f69d865b4495beede9c4184003 /include/linux/if_bonding.h | |
parent | e1fd18656c2963e383d67b7006c0e06c9c1d9c79 (diff) | |
parent | 94545baded0bfbabdc30a3a4cb48b3db479dd6ef (diff) | |
download | op-kernel-dev-b242a60206881559bb3102110048762422e6b74e.zip op-kernel-dev-b242a60206881559bb3102110048762422e6b74e.tar.gz |
Merge branch 'linux-2.6'
Diffstat (limited to 'include/linux/if_bonding.h')
-rw-r--r-- | include/linux/if_bonding.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/if_bonding.h b/include/linux/if_bonding.h index 84598fa..65c2d24 100644 --- a/include/linux/if_bonding.h +++ b/include/linux/if_bonding.h @@ -85,7 +85,8 @@ /* hashing types */ #define BOND_XMIT_POLICY_LAYER2 0 /* layer 2 (MAC only), default */ -#define BOND_XMIT_POLICY_LAYER34 1 /* layer 3+4 (IP ^ MAC) */ +#define BOND_XMIT_POLICY_LAYER34 1 /* layer 3+4 (IP ^ (TCP || UDP)) */ +#define BOND_XMIT_POLICY_LAYER23 2 /* layer 2+3 (IP ^ MAC) */ typedef struct ifbond { __s32 bond_mode; |