diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2003-03-23 00:24:54 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-03-23 00:24:54 -0800 |
| commit | 1eb0a9ec1a487516d5ebcdb88b3fe1e1a8caeaee (patch) | |
| tree | 5c2c26702127878bf5f9f95e039cd5b39ed29239 /include/linux | |
| parent | bab7bf66ffe268c9f527a1071dea3a7f9895d266 (diff) | |
| parent | 584d39284634f632fa3d4e72bb751dde37201e2f (diff) | |
Merge bk://kernel.bkbits.net/davem/net-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/in6.h | 3 | ||||
| -rw-r--r-- | include/linux/netfilter_bridge/ebtables.h | 1 | ||||
| -rw-r--r-- | include/linux/pfkeyv2.h | 8 | ||||
| -rw-r--r-- | include/linux/xfrm.h | 7 |
4 files changed, 13 insertions, 6 deletions
diff --git a/include/linux/in6.h b/include/linux/in6.h index 051db67aee69..8689112d08f3 100644 --- a/include/linux/in6.h +++ b/include/linux/in6.h @@ -180,5 +180,8 @@ struct in6_flowlabel_req #define IPV6_FLOWLABEL_MGR 32 #define IPV6_FLOWINFO_SEND 33 +#define IPV6_IPSEC_POLICY 34 +#define IPV6_XFRM_POLICY 35 + #endif diff --git a/include/linux/netfilter_bridge/ebtables.h b/include/linux/netfilter_bridge/ebtables.h index cb6348d30cb2..1056e450ef14 100644 --- a/include/linux/netfilter_bridge/ebtables.h +++ b/include/linux/netfilter_bridge/ebtables.h @@ -260,6 +260,7 @@ struct ebt_table unsigned int valid_hooks); /* the data used by the kernel */ struct ebt_table_info *private; + struct module *me; }; extern int ebt_register_table(struct ebt_table *table); diff --git a/include/linux/pfkeyv2.h b/include/linux/pfkeyv2.h index c6e4e6e29f10..efb41c857ea3 100644 --- a/include/linux/pfkeyv2.h +++ b/include/linux/pfkeyv2.h @@ -262,6 +262,14 @@ struct sadb_x_ipsecrequest { #define SADB_X_EALG_AESCBC 12 #define SADB_EALG_MAX 12 +/* Compression algorithms */ +#define SADB_X_CALG_NONE 0 +#define SADB_X_CALG_OUI 1 +#define SADB_X_CALG_DEFLATE 2 +#define SADB_X_CALG_LZS 3 +#define SADB_X_CALG_LZJH 4 +#define SADB_X_CALG_MAX 4 + /* Extension Header values */ #define SADB_EXT_RESERVED 0 #define SADB_EXT_SA 1 diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h index 7458d1f49472..9c39534d0267 100644 --- a/include/linux/xfrm.h +++ b/include/linux/xfrm.h @@ -12,12 +12,7 @@ */ typedef union { - struct { - __u32 addr; - __u32 mask; /* Use unused bits to cache mask. */ - } a4; -#define xfrm4_addr a4.addr -#define xfrm4_mask a4.mask + __u32 a4; __u32 a6[4]; } xfrm_address_t; |