diff options
| author | Greg KH <gregkh@suse.de> | 2005-09-12 15:10:59 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-12 15:10:59 -0400 |
| commit | ad2c10f8f00d3fe2e37dd8a107e7cf4ac0459489 (patch) | |
| tree | 5571f6a5784f51efddf9c1ee0408894cd63a460f /include/linux/ipv6.h | |
| parent | 6b7839007098a6b5612d31690e11277d4242e6ae (diff) | |
| parent | 2ade81473636b33aaac64495f89a7dc572c529f0 (diff) | |
Merge ../torvalds-2.6/
Diffstat (limited to 'include/linux/ipv6.h')
| -rw-r--r-- | include/linux/ipv6.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h index 6c5f7b39a4b0..bb6f88e14061 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h | |||
| @@ -68,7 +68,7 @@ struct ipv6_opt_hdr { | |||
| 68 | 68 | ||
| 69 | struct rt0_hdr { | 69 | struct rt0_hdr { |
| 70 | struct ipv6_rt_hdr rt_hdr; | 70 | struct ipv6_rt_hdr rt_hdr; |
| 71 | __u32 bitmap; /* strict/loose bit map */ | 71 | __u32 reserved; |
| 72 | struct in6_addr addr[0]; | 72 | struct in6_addr addr[0]; |
| 73 | 73 | ||
| 74 | #define rt0_type rt_hdr.type | 74 | #define rt0_type rt_hdr.type |