diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-06-05 19:19:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-06-05 19:19:46 -0700 |
| commit | fa8d24b9c057cbd45e58a5868f3b703b4e613c11 (patch) | |
| tree | 1daec2ac57148963af86278b0548b3a3bf80bbb8 /include | |
| parent | 50da7d0e7884c4ff01ab8aa9cf467b721ef681bf (diff) | |
| parent | 15fea1233f1e35883f76b71c33859d5b62aca545 (diff) | |
Merge master.kernel.org:/home/davem/BK/net-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/if_bonding.h | 5 | ||||
| -rw-r--r-- | include/net/pkt_sched.h | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/if_bonding.h b/include/linux/if_bonding.h index 97d490fd8dd8..a263da6bd01c 100644 --- a/include/linux/if_bonding.h +++ b/include/linux/if_bonding.h @@ -51,7 +51,7 @@ #define BOND_STATE_ACTIVE 0 /* link is active */ #define BOND_STATE_BACKUP 1 /* link is backup */ -#define MAX_BONDS 1 /* Maximum number of devices to support */ +#define BOND_DEFAULT_MAX_BONDS 1 /* Default maximum number of devices to support */ typedef struct ifbond { __s32 bond_mode; @@ -76,6 +76,7 @@ typedef struct slave { short delay; char link; /* one of BOND_LINK_XXXX */ char state; /* one of BOND_STATE_XXXX */ + unsigned short original_flags; u32 link_failure_count; } slave_t; @@ -104,6 +105,8 @@ typedef struct bonding { #endif /* CONFIG_PROC_FS */ struct bonding *next_bond; struct net_device *device; + struct dev_mc_list *mc_list; + unsigned short flags; } bonding_t; #endif /* __KERNEL__ */ diff --git a/include/net/pkt_sched.h b/include/net/pkt_sched.h index 84c94256dc65..313bf3b7b212 100644 --- a/include/net/pkt_sched.h +++ b/include/net/pkt_sched.h @@ -8,6 +8,7 @@ #define PSCHED_CLOCK_SOURCE PSCHED_JIFFIES #include <linux/config.h> +#include <linux/types.h> #include <linux/pkt_sched.h> #include <net/pkt_cls.h> @@ -221,7 +222,7 @@ extern psched_time_t psched_time_base; #define PSCHED_EXPORTLIST_2 -#if ~0UL == 0xFFFFFFFF +#if BITS_PER_LONG <= 32 #define PSCHED_WATCHER unsigned long |