From 4f7ece8e6985f6825ad3177aa2f049b199468cb5 Mon Sep 17 00:00:00 2001
From: "Alexey I. Froloff" <raorn@raorn.name>
Date: Fri, 6 Apr 2012 05:50:58 +0000
Subject: [PATCH] --- yaml --- r: 300597 b: refs/heads/master c:
 e35f30c131a562bafd069820a6983fd4023e606e h: refs/heads/master i:   300595:
 77b78028f12df6b64687fecfc4767a2f63632ae5 v: v3

---
 [refs]                    | 2 +-
 trunk/include/net/ndisc.h | 1 +
 trunk/net/ipv6/ndisc.c    | 4 +++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7578b75f993f..9e830521b40c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 64d176fce1a28c7cef2f239936b760ed61c59586
+refs/heads/master: e35f30c131a562bafd069820a6983fd4023e606e
diff --git a/trunk/include/net/ndisc.h b/trunk/include/net/ndisc.h
index 6f9c25a76cd1..c02b6ad3f6c5 100644
--- a/trunk/include/net/ndisc.h
+++ b/trunk/include/net/ndisc.h
@@ -34,6 +34,7 @@ enum {
 	__ND_OPT_ARRAY_MAX,
 	ND_OPT_ROUTE_INFO = 24,		/* RFC4191 */
 	ND_OPT_RDNSS = 25,		/* RFC5006 */
+	ND_OPT_DNSSL = 31,		/* RFC6106 */
 	__ND_OPT_MAX
 };
 
diff --git a/trunk/net/ipv6/ndisc.c b/trunk/net/ipv6/ndisc.c
index 1d6fb0c94da1..7cb236e8e261 100644
--- a/trunk/net/ipv6/ndisc.c
+++ b/trunk/net/ipv6/ndisc.c
@@ -15,6 +15,7 @@
 /*
  *	Changes:
  *
+ *	Alexey I. Froloff		:	RFC6106 (DNSSL) support
  *	Pierre Ynard			:	export userland ND options
  *						through netlink (RDNSS support)
  *	Lars Fenneberg			:	fixed MTU setting on receipt
@@ -228,7 +229,8 @@ static struct nd_opt_hdr *ndisc_next_option(struct nd_opt_hdr *cur,
 
 static inline int ndisc_is_useropt(struct nd_opt_hdr *opt)
 {
-	return opt->nd_opt_type == ND_OPT_RDNSS;
+	return opt->nd_opt_type == ND_OPT_RDNSS ||
+		opt->nd_opt_type == ND_OPT_DNSSL;
 }
 
 static struct nd_opt_hdr *ndisc_next_useropt(struct nd_opt_hdr *cur,