Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit e35f30c131a562bafd069820a6983fd4023e606e

Authored by Alexey I. Froloff
Committed by David S. Miller
1 parent 64d176fce1
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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>

Showing 2 changed files with 4 additions and 1 deletions Side-by-side Diff

... ... @@ -34,6 +34,7 @@
34 34 __ND_OPT_ARRAY_MAX,
35 35 ND_OPT_ROUTE_INFO = 24, /* RFC4191 */
36 36 ND_OPT_RDNSS = 25, /* RFC5006 */
  37 + ND_OPT_DNSSL = 31, /* RFC6106 */
37 38 __ND_OPT_MAX
38 39 };
39 40  
... ... @@ -15,6 +15,7 @@
15 15 /*
16 16 * Changes:
17 17 *
  18 + * Alexey I. Froloff : RFC6106 (DNSSL) support
18 19 * Pierre Ynard : export userland ND options
19 20 * through netlink (RDNSS support)
20 21 * Lars Fenneberg : fixed MTU setting on receipt
... ... @@ -228,7 +229,8 @@
228 229  
229 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 236 static struct nd_opt_hdr *ndisc_next_useropt(struct nd_opt_hdr *cur,