diff options
author | Alexey I. Froloff <raorn@raorn.name> | 2012-04-06 01:50:58 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-04-12 15:56:57 -0400 |
commit | e35f30c131a562bafd069820a6983fd4023e606e (patch) | |
tree | 7768d88caf0ae7950a586340510eb965bbc5bded /net/ipv6/ndisc.c | |
parent | 64d176fce1a28c7cef2f239936b760ed61c59586 (diff) |
Treat ND option 31 as userland (DNSSL support)
As specified in RFC6106, DNSSL option contains one or more domain names
of DNS suffixes. 8-bit identifier of the DNSSL option type as assigned
by the IANA is 31. This option should also be treated as userland.
Signed-off-by: Alexey I. Froloff <raorn@raorn.name>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ndisc.c')
-rw-r--r-- | net/ipv6/ndisc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index 1d6fb0c94da1..7cb236e8e261 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c | |||
@@ -15,6 +15,7 @@ | |||
15 | /* | 15 | /* |
16 | * Changes: | 16 | * Changes: |
17 | * | 17 | * |
18 | * Alexey I. Froloff : RFC6106 (DNSSL) support | ||
18 | * Pierre Ynard : export userland ND options | 19 | * Pierre Ynard : export userland ND options |
19 | * through netlink (RDNSS support) | 20 | * through netlink (RDNSS support) |
20 | * Lars Fenneberg : fixed MTU setting on receipt | 21 | * Lars Fenneberg : fixed MTU setting on receipt |
@@ -228,7 +229,8 @@ static struct nd_opt_hdr *ndisc_next_option(struct nd_opt_hdr *cur, | |||
228 | 229 | ||
229 | static inline int ndisc_is_useropt(struct nd_opt_hdr *opt) | 230 | static inline int ndisc_is_useropt(struct nd_opt_hdr *opt) |
230 | { | 231 | { |
231 | return opt->nd_opt_type == ND_OPT_RDNSS; | 232 | return opt->nd_opt_type == ND_OPT_RDNSS || |
233 | opt->nd_opt_type == ND_OPT_DNSSL; | ||
232 | } | 234 | } |
233 | 235 | ||
234 | static struct nd_opt_hdr *ndisc_next_useropt(struct nd_opt_hdr *cur, | 236 | static struct nd_opt_hdr *ndisc_next_useropt(struct nd_opt_hdr *cur, |