diff options
| author |   Mark Brown <broonie@kernel.org> | 2018-08-28 19:03:57 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-08-28 19:03:57 +0100 |
| commit | 6e2d6b2728fcb408eabd7991804f8cb33ff59f20 (patch) | |
| tree | 18dc3fc5bd55fa9ff92430e4ab8353de6c5c0e55 /include/uapi/linux/sysctl.h | |
| parent | ASoC: rt5514: Fix the issue of the delay volume applied again (diff) | |
| parent | Linux 4.19-rc1 (diff) | |
Merge tag 'v4.19-rc1' into asoc-4.19
Linux 4.19-rc1
Diffstat (limited to 'include/uapi/linux/sysctl.h')
| -rw-r--r-- | include/uapi/linux/sysctl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/uapi/linux/sysctl.h b/include/uapi/linux/sysctl.h index 6b58371b1f0d..d71013fffaf6 100644 --- a/include/uapi/linux/sysctl.h +++ b/include/uapi/linux/sysctl.h @@ -575,7 +575,8 @@ enum { /* /proc/sys/net/ipv6/icmp */ enum { - NET_IPV6_ICMP_RATELIMIT=1 + NET_IPV6_ICMP_RATELIMIT = 1, + NET_IPV6_ICMP_ECHO_IGNORE_ALL = 2 }; /* /proc/sys/net/<protocol>/neigh/<dev> */ |