diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-01-05 04:50:33 -0500 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-01-05 04:50:33 -0500 |
| commit | 353816f43d1fb340ff2d9a911dd5d0799c09f6a5 (patch) | |
| tree | 517290fd884d286fe2971137ac89f89e3567785a /include/linux/ipv6.h | |
| parent | 160bbab3000dafccbe43688e48208cecf4deb879 (diff) | |
| parent | fe0bdec68b77020281dc814805edfe594ae89e0f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/arm/mach-pxa/corgi.c
arch/arm/mach-pxa/poodle.c
arch/arm/mach-pxa/spitz.c
Diffstat (limited to 'include/linux/ipv6.h')
| -rw-r--r-- | include/linux/ipv6.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h index 641e026eee8f..0b816cae533e 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h | |||
| @@ -278,6 +278,7 @@ struct ipv6_pinfo { | |||
| 278 | struct in6_addr saddr; | 278 | struct in6_addr saddr; |
| 279 | struct in6_addr rcv_saddr; | 279 | struct in6_addr rcv_saddr; |
| 280 | struct in6_addr daddr; | 280 | struct in6_addr daddr; |
| 281 | struct in6_pktinfo sticky_pktinfo; | ||
| 281 | struct in6_addr *daddr_cache; | 282 | struct in6_addr *daddr_cache; |
| 282 | #ifdef CONFIG_IPV6_SUBTREES | 283 | #ifdef CONFIG_IPV6_SUBTREES |
| 283 | struct in6_addr *saddr_cache; | 284 | struct in6_addr *saddr_cache; |