Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[~andy/linux] / include / net / ndisc.h

diff --git a/include/net/ndisc.h b/include/net/ndisc.h
index 6f9c25a76cd1328856293c1af4d9cf8b10188c1c..c02b6ad3f6c589359a9de57f48fa38d683010349 100644 (file)
--- a/include/net/ndisc.h
+++ b/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
 };