diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-06-05 19:44:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-06-05 19:44:14 -0700 |
| commit | 3da9cf2895a490d8c7a1a8d78130f66a88e93efa (patch) | |
| tree | 95bbd1af5a92a84a27cc2045adfcc94f1d90ae01 /include/linux | |
| parent | 7f9efd7d0fc6d0fc8caff52872629e36e212fb3c (diff) | |
| parent | 8a9b07a2a23851c8207a25e9dcb2dfd91fed3230 (diff) | |
Merge penguin:v2.5/linux
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/if_bonding.h | 5 | ||||
| -rw-r--r-- | include/linux/init.h | 4 | ||||
| -rw-r--r-- | include/linux/sunrpc/xdr.h | 7 | ||||
| -rw-r--r-- | include/linux/zlib.h | 2 |
4 files changed, 10 insertions, 8 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/linux/init.h b/include/linux/init.h index ca7e75f37883..b45b95c5e640 100644 --- a/include/linux/init.h +++ b/include/linux/init.h @@ -61,7 +61,7 @@ extern initcall_t __initcall_start, __initcall_end; static initcall_t __initcall_##fn __attribute__ ((unused,__section__ (".initcall" level ".init"))) = fn #define core_initcall(fn) __define_initcall("1",fn) -#define unused_initcall(fn) __define_initcall("2",fn) +#define postcore_initcall(fn) __define_initcall("2",fn) #define arch_initcall(fn) __define_initcall("3",fn) #define subsys_initcall(fn) __define_initcall("4",fn) #define fs_initcall(fn) __define_initcall("5",fn) @@ -160,7 +160,7 @@ typedef void (*__cleanup_module_func_t)(void); #define __setup(str,func) /* nothing */ #define core_initcall(fn) module_init(fn) -#define unused_initcall(fn) module_init(fn) +#define postcore_initcall(fn) module_init(fn) #define arch_initcall(fn) module_init(fn) #define subsys_initcall(fn) module_init(fn) #define fs_initcall(fn) module_init(fn) diff --git a/include/linux/sunrpc/xdr.h b/include/linux/sunrpc/xdr.h index 821c2e0704df..3875f87e938b 100644 --- a/include/linux/sunrpc/xdr.h +++ b/include/linux/sunrpc/xdr.h @@ -137,10 +137,9 @@ void xdr_zero_iovec(struct iovec *, int, size_t); /* * XDR buffer helper functions */ -extern int xdr_kmap(struct iovec *, struct xdr_buf *, unsigned int); -extern void xdr_kunmap(struct xdr_buf *, unsigned int); -extern void xdr_shift_buf(struct xdr_buf *, unsigned int); -extern void xdr_zero_buf(struct xdr_buf *, unsigned int); +extern int xdr_kmap(struct iovec *, struct xdr_buf *, size_t); +extern void xdr_kunmap(struct xdr_buf *, size_t); +extern void xdr_shift_buf(struct xdr_buf *, size_t); /* * Helper structure for copying from an sk_buff. diff --git a/include/linux/zlib.h b/include/linux/zlib.h index 43b32c613d76..4582d5343c89 100644 --- a/include/linux/zlib.h +++ b/include/linux/zlib.h @@ -31,7 +31,7 @@ #ifndef _ZLIB_H #define _ZLIB_H -#include "zconf.h" +#include <linux/zconf.h> #ifdef __cplusplus extern "C" { |