nfsd4: reshuffle lease-setting code to allow reuse

[safe/jmp/linux-2.6] / include / linux / ipv6.h

diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index 391ad08..e0cc9a7 100644 (file)
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -1,6 +1,7 @@
 #ifndef _IPV6_H
 #define _IPV6_H
 
+#include <linux/types.h>
 #include <linux/in6.h>
 #include <asm/byteorder.h>
 
@@ -123,6 +124,7 @@ struct ipv6hdr {
        struct  in6_addr        daddr;
 };
 
+#ifdef __KERNEL__
 /*
  * This structure contains configuration options per IPv6 link.
  */
@@ -165,9 +167,17 @@ struct ipv6_devconf {
 #endif
        __s32           disable_ipv6;
        __s32           accept_dad;
+       __s32           force_tllao;
        void            *sysctl;
 };
 
+struct ipv6_params {
+       __s32 disable_ipv6;
+       __s32 autoconf;
+};
+extern struct ipv6_params ipv6_defaults;
+#endif
+
 /* index values for the variables in ipv6_devconf */
 enum {
        DEVCONF_FORWARDING = 0,
@@ -198,6 +208,7 @@ enum {
        DEVCONF_MC_FORWARDING,
        DEVCONF_DISABLE_IPV6,
        DEVCONF_ACCEPT_DAD,
+       DEVCONF_FORCE_TLLAO,
        DEVCONF_MAX
 };
 
@@ -276,6 +287,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;
@@ -493,7 +505,7 @@ static inline struct raw6_sock *raw6_sk(const struct sock *sk)
 
 #define INET6_MATCH(__sk, __net, __hash, __saddr, __daddr, __ports, __dif)\
        (((__sk)->sk_hash == (__hash)) && sock_net((__sk)) == (__net)   && \
-        ((*((__portpair *)&(inet_sk(__sk)->dport))) == (__ports))      && \
+        ((*((__portpair *)&(inet_sk(__sk)->inet_dport))) == (__ports)) && \
         ((__sk)->sk_family             == AF_INET6)            && \
         ipv6_addr_equal(&inet6_sk(__sk)->daddr, (__saddr))     && \
         ipv6_addr_equal(&inet6_sk(__sk)->rcv_saddr, (__daddr)) && \