Merge branches 'bugzilla-11884' and 'bugzilla-8544' into release

[linux-2.6-omap-h63xx.git] / include / linux / ipv6.h

diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index 641e026eee8f1e3301a3297b85b0d6bafbcaadf5..0b816cae533eea35ece747f5c7921a3df8c979e3 100644 (file)
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -278,6 +278,7 @@ struct ipv6_pinfo {
        struct in6_addr         saddr;
        struct in6_addr         rcv_saddr;
        struct in6_addr         daddr;
+       struct in6_pktinfo      sticky_pktinfo;
        struct in6_addr         *daddr_cache;
 #ifdef CONFIG_IPV6_SUBTREES
        struct in6_addr         *saddr_cache;