summaryrefslogtreecommitdiff
path: root/include/net
diff options
context:
space:
mode:
authorMaciej Żenczykowski <maze@google.com>2019-07-18 23:30:03 -0700
committerAlistair Delva <adelva@google.com>2019-08-12 21:04:42 +0000
commitbcb576e1a7f16853cc965de5516c5afbbfeec8a9 (patch)
tree4cde379937ff124758ca6d2a646cef96e850b7ad /include/net
parent6cfb5a870f75eee5bf5b3401f00e9b9cfaf7f27b (diff)
UPSTREAM: net-ipv6-ndisc: add support for RFC7710 RA Captive Portal Identifier
This is trivial since we already have support for the entirely identical (from the kernel's point of view) RDNSS and DNSSL that also contain opaque data that needs to be passed down to userspace. As specified in RFC7710, Captive Portal option contains a URL. 8-bit identifier of the option type as assigned by the IANA is 37. This option should also be treated as userland. Hence, treat ND option 37 as userland (Captive Portal support) See: https://tools.ietf.org/html/rfc7710 https://www.iana.org/assignments/icmpv6-parameters/icmpv6-parameters.xhtml Fixes: e35f30c131a56 Signed-off-by: Maciej Żenczykowski <maze@google.com> Cc: Lorenzo Colitti <lorenzo@google.com> Cc: Remin Nguyen Van <reminv@google.com> Cc: Alexey I. Froloff <raorn@raorn.name> Signed-off-by: David S. Miller <davem@davemloft.net> Bug: 137914568 Change-Id: I73c12c45660e6371c1e193f799c0da7d97bd5435 (cherry picked from commit 66b5f1c439843bcbab01cc7f3854ae2742f3d1e3)
Diffstat (limited to 'include/net')
-rw-r--r--include/net/ndisc.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/ndisc.h b/include/net/ndisc.h
index 2d8edaad29cb..da7ffc04ce0c 100644
--- a/include/net/ndisc.h
+++ b/include/net/ndisc.h
@@ -35,6 +35,7 @@ enum {
ND_OPT_ROUTE_INFO = 24, /* RFC4191 */
ND_OPT_RDNSS = 25, /* RFC5006 */
ND_OPT_DNSSL = 31, /* RFC6106 */
+ ND_OPT_CAPTIVE_PORTAL = 37, /* RFC7710 */
__ND_OPT_MAX
};