diff options
| author | David S. Miller <davem@nuts.ninka.net> | 2002-12-22 07:03:20 -0800 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2002-12-22 07:03:20 -0800 |
| commit | 5d7154f7f2d770811dde0f6ad9570565d01c19ee (patch) | |
| tree | fb954bfe0690ca6e1f592e14e62ac35cc049f014 /include/linux | |
| parent | 5e163a89fedacf47100735e738c43687d3bf18a2 (diff) | |
| parent | 9bfb076682a089c924f9fe4b5746e42f56241471 (diff) | |
Merge nuts.ninka.net:/home/davem/src/BK/network-2.5
into nuts.ninka.net:/home/davem/src/BK/net-2.5
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/if_bonding.h | 10 |
1 files changed, 7 insertions, 3 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; |