diff options
| author | David S. Miller <davem@kernel.bkbits.net> | 2002-12-22 07:30:15 -0800 |
|---|---|---|
| committer | David S. Miller <davem@kernel.bkbits.net> | 2002-12-22 07:30:15 -0800 |
| commit | b4f94e3f5db49e23ec78ac80d665c2da2b0ecc58 (patch) | |
| tree | 76a2e0ec322e2dba0cd6b8e9dce203e739c99425 /include/linux | |
| parent | 52a150d810cd41006755f53093e3e804fec57b3c (diff) | |
| parent | 545ac82cd0fef437750c884a30bed9beefd99510 (diff) | |
Merge ssh://nuts.ninka.net//home/davem/src/BK/net-2.5
into kernel.bkbits.net:/home/davem/net-2.5
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/if_bonding.h | 10 | ||||
| -rw-r--r-- | include/linux/sysctl.h | 3 |
2 files changed, 9 insertions, 4 deletions
diff --git a/include/linux/if_bonding.h b/include/linux/if_bonding.h index a263da6bd01c..b673b0830ddd 100644 --- a/include/linux/if_bonding.h +++ b/include/linux/if_bonding.h @@ -37,9 +37,10 @@ #define BOND_CHECK_MII_STATUS (SIOCGMIIPHY) -#define BOND_MODE_ROUNDROBIN 0 -#define BOND_MODE_ACTIVEBACKUP 1 -#define BOND_MODE_XOR 2 +#define BOND_MODE_ROUNDROBIN 0 +#define BOND_MODE_ACTIVEBACKUP 1 +#define BOND_MODE_XOR 2 +#define BOND_MODE_BROADCAST 3 /* each slave's link has 4 states */ #define BOND_LINK_UP 0 /* link is up and running */ @@ -74,6 +75,7 @@ typedef struct slave { struct slave *prev; struct net_device *dev; short delay; + unsigned long jiffies; char link; /* one of BOND_LINK_XXXX */ char state; /* one of BOND_STATE_XXXX */ unsigned short original_flags; @@ -93,6 +95,8 @@ typedef struct bonding { slave_t *next; slave_t *prev; slave_t *current_slave; + slave_t *primary_slave; + slave_t *current_arp_slave; __s32 slave_cnt; rwlock_t lock; rwlock_t ptrlock; diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index 0b905659ac4b..b115623159e9 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h @@ -544,7 +544,8 @@ enum { NET_SCTP_PATH_MAX_RETRANS = 8, NET_SCTP_MAX_INIT_RETRANSMITS = 9, NET_SCTP_HB_INTERVAL = 10, - NET_SCTP_MAX_BURST = 11, + NET_SCTP_PRESERVE_ENABLE = 11, + NET_SCTP_MAX_BURST = 12, }; /* CTL_PROC names: */ |