diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-09 14:18:33 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-09 14:18:33 -0500 |
| commit | 0a3a98f6dd4e8f4d928a09302c0d1c56f2192ac3 (patch) | |
| tree | 92f55e374a84d06ce8213a4540454760fdecf137 /include/linux/ipv6.h | |
| parent | 8ef12c9f01afba47c2d33bb939085111ca0d0f7d (diff) | |
| parent | 5367f2d67c7d0bf1faae90e6e7b4e2ac3c9b5e0f (diff) | |
Merge Linus' tree.
Diffstat (limited to 'include/linux/ipv6.h')
| -rw-r--r-- | include/linux/ipv6.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h index 93bbed5c6cf4..9c8f4c9ed429 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h | |||
| @@ -191,6 +191,10 @@ struct inet6_skb_parm { | |||
| 191 | __u16 srcrt; | 191 | __u16 srcrt; |
| 192 | __u16 dst1; | 192 | __u16 dst1; |
| 193 | __u16 lastopt; | 193 | __u16 lastopt; |
| 194 | __u32 nhoff; | ||
| 195 | __u16 flags; | ||
| 196 | |||
| 197 | #define IP6SKB_XFRM_TRANSFORMED 1 | ||
| 194 | }; | 198 | }; |
| 195 | 199 | ||
| 196 | #define IP6CB(skb) ((struct inet6_skb_parm*)((skb)->cb)) | 200 | #define IP6CB(skb) ((struct inet6_skb_parm*)((skb)->cb)) |