diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-09-03 19:01:36 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-09-03 19:01:36 -0400 |
| commit | 516d5f8b04ce2bcd24f03323fc743ae25b81373d (patch) | |
| tree | ff37e84692dbef5063bbf22672eb8bfad0f25dd8 /include/uapi/linux/sysctl.h | |
| parent | 6ba694560caeb3531dbedd5b3a37af037ef2a833 (diff) | |
| parent | 69e273c0b0a3c337a521d083374c918dc52c666f (diff) | |
Merge tag 'v3.17-rc3' into next
Sync with mainline to bring in Chrome EC changes.
Diffstat (limited to 'include/uapi/linux/sysctl.h')
| -rw-r--r-- | include/uapi/linux/sysctl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/sysctl.h b/include/uapi/linux/sysctl.h index 6d6721341f49..43aaba1cc037 100644 --- a/include/uapi/linux/sysctl.h +++ b/include/uapi/linux/sysctl.h | |||
| @@ -568,6 +568,7 @@ enum { | |||
| 568 | NET_IPV6_ACCEPT_RA_RT_INFO_MAX_PLEN=22, | 568 | NET_IPV6_ACCEPT_RA_RT_INFO_MAX_PLEN=22, |
| 569 | NET_IPV6_PROXY_NDP=23, | 569 | NET_IPV6_PROXY_NDP=23, |
| 570 | NET_IPV6_ACCEPT_SOURCE_ROUTE=25, | 570 | NET_IPV6_ACCEPT_SOURCE_ROUTE=25, |
| 571 | NET_IPV6_ACCEPT_RA_FROM_LOCAL=26, | ||
| 571 | __NET_IPV6_MAX | 572 | __NET_IPV6_MAX |
| 572 | }; | 573 | }; |
| 573 | 574 | ||