Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs...

[mv-sheeva.git] / include / linux / ipv6.h

diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index 476d9464ac82d27c53a0fc48c435639f77391dcd..c662efa6828985a4025951a1c655cf5bf85300cf 100644 (file)
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -169,6 +169,12 @@ struct ipv6_devconf {
        __s32           accept_dad;
        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 */