2 files changed, 30 insertions, 0 deletions

diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index dff3192374f8..5bf618241ab9 100644
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -97,6 +97,9 @@ enum {
         RTM_SETNEIGHTBL,
 #define RTM_SETNEIGHTBL RTM_SETNEIGHTBL
 
+        RTM_NEWNDUSEROPT = 68,
+#define RTM_NEWNDUSEROPT RTM_NEWNDUSEROPT
+
         __RTM_MAX,
 #define RTM_MAX         (((__RTM_MAX + 3) & ~3) - 1)
 };
@@ -479,6 +482,30 @@ enum
 #define TCA_RTA(r)  ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct tcmsg))))
 #define TCA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct tcmsg))
 
+/********************************************************************
+ *              Neighbor Discovery userland options
+ ****/
+
+struct nduseroptmsg
+{
+        unsigned char   nduseropt_family;
+        unsigned char   nduseropt_pad1;
+        unsigned short  nduseropt_opts_len;     /* Total length of options */
+        __u8            nduseropt_icmp_type;
+        __u8            nduseropt_icmp_code;
+        unsigned short  nduseropt_pad2;
+        /* Followed by one or more ND options */
+};
+
+enum
+{
+        NDUSEROPT_UNSPEC,
+        NDUSEROPT_SRCADDR,
+        __NDUSEROPT_MAX
+};
+
+#define NDUSEROPT_MAX   (__NDUSEROPT_MAX - 1)
+
 #ifndef __KERNEL__
 /* RTnetlink multicast groups - backwards compatibility for userspace */
 #define RTMGRP_LINK             1
@@ -542,6 +569,8 @@ enum rtnetlink_groups {
 #define RTNLGRP_IPV6_PREFIX     RTNLGRP_IPV6_PREFIX
         RTNLGRP_IPV6_RULE,
 #define RTNLGRP_IPV6_RULE       RTNLGRP_IPV6_RULE
+        RTNLGRP_ND_USEROPT,
+#define RTNLGRP_ND_USEROPT      RTNLGRP_ND_USEROPT
         __RTNLGRP_MAX
 };
 #define RTNLGRP_MAX     (__RTNLGRP_MAX - 1)
diff --git a/include/net/ndisc.h b/include/net/ndisc.h
index 475b10c575b3..6684f7efbeeb 100644
--- a/include/net/ndisc.h
+++ b/include/net/ndisc.h
@@ -24,6 +24,7 @@ enum {
         ND_OPT_MTU = 5,                 /* RFC2461 */
         __ND_OPT_ARRAY_MAX,
         ND_OPT_ROUTE_INFO = 24,         /* RFC4191 */
+        ND_OPT_RDNSS = 25,              /* RFC5006 */
         __ND_OPT_MAX
 };