aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/ipv6.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-06-29 03:16:13 -0400
committerIngo Molnar <mingo@elte.hu>2009-06-29 03:16:25 -0400
commit348b346b238d9c0e5694c8d0b835a099cb383835 (patch)
tree967d9c72a1d6d33a408a1ff0d732296dbe8d3674 /include/linux/ipv6.h
parent6c697bdf08a09ce461e305a22362973036e95db3 (diff)
parent52989765629e7d182b4f146050ebba0abf2cb0b7 (diff)
Merge branch 'linus' into sched/core
Merge reason: we will merge a dependent patch. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/ipv6.h')
-rw-r--r--include/linux/ipv6.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index 476d9464ac82..c662efa68289 100644
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -169,6 +169,12 @@ struct ipv6_devconf {
169 __s32 accept_dad; 169 __s32 accept_dad;
170 void *sysctl; 170 void *sysctl;
171}; 171};
172
173struct ipv6_params {
174 __s32 disable_ipv6;
175 __s32 autoconf;
176};
177extern struct ipv6_params ipv6_defaults;
172#endif 178#endif
173 179
174/* index values for the variables in ipv6_devconf */ 180/* index values for the variables in ipv6_devconf */