Merge remote-tracking branch 'asoc/fix/wm8962' into asoc-linus

[cascardo/linux.git] / include / linux / ipv6.h

diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index b8b7dc7..28ea384 100644 (file)
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -19,6 +19,8 @@ struct ipv6_devconf {
        __s32           rtr_solicit_interval;
        __s32           rtr_solicit_delay;
        __s32           force_mld_version;
+       __s32           mldv1_unsolicited_report_interval;
+       __s32           mldv2_unsolicited_report_interval;
 #ifdef CONFIG_IPV6_PRIVACY
        __s32           use_tempaddr;
        __s32           temp_valid_lft;
@@ -48,6 +50,7 @@ struct ipv6_devconf {
        __s32           accept_dad;
        __s32           force_tllao;
        __s32           ndisc_notify;
+       __s32           suppress_frag_ndisc;
        void            *sysctl;
 };