Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b3c1b2f authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "net-ipv6-ndisc: add support for 'PREF64' dns64 prefix identifier"

parents c4ab8871 4407b678

include/net/ndisc.h

+1 −0
Original line number Diff line number Diff line
@@ -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

};

net/ipv6/ndisc.c

+1 −0
Original line number Diff line number Diff line
@@ -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);

}