diff --git a/abi_gki_aarch64.xml b/abi_gki_aarch64.xml
index b917a2584ae2..61526bd1912a 100644
--- a/abi_gki_aarch64.xml
+++ b/abi_gki_aarch64.xml
@@ -40002,29 +40002,29 @@
           <var-decl name='skc_num' type-id='type-id-216' visibility='default' filepath='include/net/sock.h' line='172' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='nd_opt_hdr' size-in-bits='16' is-struct='yes' visibility='default' filepath='include/net/ndisc.h' line='102' column='1' id='type-id-4443'>
+      <class-decl name='nd_opt_hdr' size-in-bits='16' is-struct='yes' visibility='default' filepath='include/net/ndisc.h' line='103' column='1' id='type-id-4443'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='nd_opt_type' type-id='type-id-160' visibility='default' filepath='include/net/ndisc.h' line='103' column='1'/>
+          <var-decl name='nd_opt_type' type-id='type-id-160' visibility='default' filepath='include/net/ndisc.h' line='104' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='8'>
-          <var-decl name='nd_opt_len' type-id='type-id-160' visibility='default' filepath='include/net/ndisc.h' line='104' column='1'/>
+          <var-decl name='nd_opt_len' type-id='type-id-160' visibility='default' filepath='include/net/ndisc.h' line='105' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='ndisc_options' size-in-bits='1216' is-struct='yes' visibility='default' filepath='include/net/ndisc.h' line='108' column='1' id='type-id-4444'>
+      <class-decl name='ndisc_options' size-in-bits='1216' is-struct='yes' visibility='default' filepath='include/net/ndisc.h' line='109' column='1' id='type-id-4444'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='nd_opt_array' type-id='type-id-4383' visibility='default' filepath='include/net/ndisc.h' line='109' column='1'/>
+          <var-decl name='nd_opt_array' type-id='type-id-4383' visibility='default' filepath='include/net/ndisc.h' line='110' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='960'>
-          <var-decl name='nd_opts_ri' type-id='type-id-4382' visibility='default' filepath='include/net/ndisc.h' line='111' column='1'/>
+          <var-decl name='nd_opts_ri' type-id='type-id-4382' visibility='default' filepath='include/net/ndisc.h' line='112' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1024'>
-          <var-decl name='nd_opts_ri_end' type-id='type-id-4382' visibility='default' filepath='include/net/ndisc.h' line='112' column='1'/>
+          <var-decl name='nd_opts_ri_end' type-id='type-id-4382' visibility='default' filepath='include/net/ndisc.h' line='113' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1088'>
-          <var-decl name='nd_useropts' type-id='type-id-4382' visibility='default' filepath='include/net/ndisc.h' line='114' column='1'/>
+          <var-decl name='nd_useropts' type-id='type-id-4382' visibility='default' filepath='include/net/ndisc.h' line='115' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1152'>
-          <var-decl name='nd_useropts_end' type-id='type-id-4382' visibility='default' filepath='include/net/ndisc.h' line='115' column='1'/>
+          <var-decl name='nd_useropts_end' type-id='type-id-4382' visibility='default' filepath='include/net/ndisc.h' line='116' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='neighbour' size-in-bits='2688' is-struct='yes' visibility='default' filepath='include/net/neighbour.h' line='135' column='1' id='type-id-4445'>
diff --git a/include/net/ndisc.h b/include/net/ndisc.h
index d2a016ef5c41..35d7c887a5b9 100644
--- a/include/net/ndisc.h
+++ b/include/net/ndisc.h
@@ -39,6 +39,7 @@ enum {
 	ND_OPT_DNSSL = 31,		/* RFC6106 */
 	ND_OPT_6CO = 34,		/* RFC6775 */
 	ND_OPT_CAPTIVE_PORTAL = 37,	/* RFC7710 */
+	ND_OPT_PREF64 = 38,		/* RFC-ietf-6man-ra-pref64-09 */
 	__ND_OPT_MAX
 };
 
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index 45d8d08d1994..171c5273acdc 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -198,6 +198,7 @@ static inline int ndisc_is_useropt(const struct net_device *dev,
 	return opt->nd_opt_type == ND_OPT_RDNSS ||
 		opt->nd_opt_type == ND_OPT_DNSSL ||
 		opt->nd_opt_type == ND_OPT_CAPTIVE_PORTAL ||
+		opt->nd_opt_type == ND_OPT_PREF64 ||
 		ndisc_ops_is_useropt(dev, opt->nd_opt_type);
 }