diff options
| author | Patrick Mochel <mochel@osdl.org> | 2003-08-13 19:36:17 -0700 |
|---|---|---|
| committer | Patrick Mochel <mochel@osdl.org> | 2003-08-13 19:36:17 -0700 |
| commit | 9bf76164abf0705fc03ffff552613f6da3b7af35 (patch) | |
| tree | 87333531c8e5265201e1710f6923caaf8d8a94ab /include/linux | |
| parent | f2df1a5f499f8d559f66900b0e3b3fbf52f88d49 (diff) | |
| parent | 3b822c88f30d825810b4134bd6d5a156628c6c03 (diff) | |
Merge osdl.org:/home/mochel/src/kernel/linux-2.5-virgin
into osdl.org:/home/mochel/src/kernel/linux-2.5-power
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/if_tun.h | 2 | ||||
| -rw-r--r-- | include/linux/ipv6.h | 2 | ||||
| -rw-r--r-- | include/linux/ppp-comp.h | 5 | ||||
| -rw-r--r-- | include/linux/xfrm.h | 3 |
4 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/if_tun.h b/include/linux/if_tun.h index f8459e01c896..ad1e168004ee 100644 --- a/include/linux/if_tun.h +++ b/include/linux/if_tun.h @@ -32,7 +32,7 @@ #endif struct tun_struct { - char *name; + struct list_head list; unsigned long flags; int attached; uid_t owner; diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h index 49207c629e4f..e4f91218676d 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h @@ -71,7 +71,7 @@ struct rt0_hdr { __u32 bitmap; /* strict/loose bit map */ struct in6_addr addr[0]; -#define rt0_type rt_hdr.type; +#define rt0_type rt_hdr.type }; struct ipv6_auth_hdr { diff --git a/include/linux/ppp-comp.h b/include/linux/ppp-comp.h index 82dd01c38920..7227e653b3be 100644 --- a/include/linux/ppp-comp.h +++ b/include/linux/ppp-comp.h @@ -185,10 +185,9 @@ struct compressor { #define DEFLATE_MIN_SIZE 9 #define DEFLATE_MAX_SIZE 15 #define DEFLATE_METHOD_VAL 8 -#define DEFLATE_SIZE(x) (((x) >> 4) + DEFLATE_MIN_SIZE) +#define DEFLATE_SIZE(x) (((x) >> 4) + 8) #define DEFLATE_METHOD(x) ((x) & 0x0F) -#define DEFLATE_MAKE_OPT(w) ((((w) - DEFLATE_MIN_SIZE) << 4) \ - + DEFLATE_METHOD_VAL) +#define DEFLATE_MAKE_OPT(w) ((((w) - 8) << 4) + DEFLATE_METHOD_VAL) #define DEFLATE_CHK_SEQUENCE 0 /* diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h index a4dd169d9f6f..430370b12d13 100644 --- a/include/linux/xfrm.h +++ b/include/linux/xfrm.h @@ -37,6 +37,7 @@ struct xfrm_selector __u16 dport_mask; __u16 sport; __u16 sport_mask; + __u16 family; __u8 prefixlen_d; __u8 prefixlen_s; __u8 proto; @@ -125,6 +126,7 @@ enum struct xfrm_user_tmpl { struct xfrm_id id; + __u16 family; xfrm_address_t saddr; __u32 reqid; __u8 mode; @@ -189,7 +191,6 @@ struct xfrm_userpolicy_info { struct xfrm_lifetime_cur curlft; __u32 priority; __u32 index; - __u16 family; __u8 dir; __u8 action; #define XFRM_POLICY_ALLOW 0 |