aboutsummaryrefslogtreecommitdiff
path: root/include/uapi
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2016-04-11 10:23:11 +0800
committerAlex Shi <alex.shi@linaro.org>2016-04-11 10:23:11 +0800
commitbfbd381ea0ca274e4c07ea62acaaeac31829cd5d (patch)
tree0531122e023ecbf1ecf9416fc1111955b10ea68b /include/uapi
parent906d9eadd3b6698fa6ceb9bcdf41da6aa56d0a24 (diff)
parent115d588693b6f8f9cfad409c091225d4095159e3 (diff)
Merge tag 'v4.1.20-rt23' of git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-stable-rt into linux-linaro-lsk-v4.1-rt
Linux 4.1.20-rt23
Diffstat (limited to 'include/uapi')
-rw-r--r--include/uapi/linux/ipv6.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/uapi/linux/ipv6.h b/include/uapi/linux/ipv6.h
index 5efa54ae567c..80f3b74446a1 100644
--- a/include/uapi/linux/ipv6.h
+++ b/include/uapi/linux/ipv6.h
@@ -171,6 +171,8 @@ enum {
DEVCONF_USE_OPTIMISTIC,
DEVCONF_ACCEPT_RA_MTU,
DEVCONF_STABLE_SECRET,
+ DEVCONF_USE_OIF_ADDRS_ONLY,
+ DEVCONF_ACCEPT_RA_MIN_HOP_LIMIT,
DEVCONF_MAX
};