diff options
| author | Patrick McHardy <kaber@trash.net> | 2010-06-15 11:31:06 -0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2010-06-15 11:31:06 -0400 |
| commit | f9181f4ffc71d7b7dd1906c9a11d51d6659220ae (patch) | |
| tree | 194f22e8216a1b9ee2c0dd019142202d73a7dc87 /include/linux/if_bonding.h | |
| parent | 0902b469bd25065aa0688c3cee6f11744c817e7c (diff) | |
| parent | 1ab6c163dee279559e3a62d774af7e4c4c9b4c67 (diff) | |
Merge branch 'master' of /repos/git/net-next-2.6
Conflicts:
include/net/netfilter/xt_rateest.h
net/bridge/br_netfilter.c
net/netfilter/nf_conntrack_core.c
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'include/linux/if_bonding.h')
| -rw-r--r-- | include/linux/if_bonding.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/if_bonding.h b/include/linux/if_bonding.h index cd525fae3c98..2c7994372bde 100644 --- a/include/linux/if_bonding.h +++ b/include/linux/if_bonding.h | |||
| @@ -83,6 +83,7 @@ | |||
| 83 | 83 | ||
| 84 | #define BOND_DEFAULT_MAX_BONDS 1 /* Default maximum number of devices to support */ | 84 | #define BOND_DEFAULT_MAX_BONDS 1 /* Default maximum number of devices to support */ |
| 85 | 85 | ||
| 86 | #define BOND_DEFAULT_TX_QUEUES 16 /* Default number of tx queues per device */ | ||
| 86 | /* hashing types */ | 87 | /* hashing types */ |
| 87 | #define BOND_XMIT_POLICY_LAYER2 0 /* layer 2 (MAC only), default */ | 88 | #define BOND_XMIT_POLICY_LAYER2 0 /* layer 2 (MAC only), default */ |
| 88 | #define BOND_XMIT_POLICY_LAYER34 1 /* layer 3+4 (IP ^ (TCP || UDP)) */ | 89 | #define BOND_XMIT_POLICY_LAYER34 1 /* layer 3+4 (IP ^ (TCP || UDP)) */ |