diff options
| author | Eric Paris <eparis@redhat.com> | 2013-11-22 18:57:08 -0500 |
|---|---|---|
| committer | Eric Paris <eparis@redhat.com> | 2013-11-22 18:57:54 -0500 |
| commit | fc582aef7dcc27a7120cf232c1e76c569c7b6eab (patch) | |
| tree | 7d275dd4ceab6067b91e9a25a5f6338b425fbccd /include/uapi/linux/ip.h | |
| parent | 9175c9d2aed528800175ef81c90569d00d23f9be (diff) | |
| parent | 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 (diff) | |
Merge tag 'v3.12'
Linux 3.12
Conflicts:
fs/exec.c
Diffstat (limited to 'include/uapi/linux/ip.h')
| -rw-r--r-- | include/uapi/linux/ip.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/uapi/linux/ip.h b/include/uapi/linux/ip.h index 2fee45bdec0a..411959405ab6 100644 --- a/include/uapi/linux/ip.h +++ b/include/uapi/linux/ip.h | |||
| @@ -162,6 +162,8 @@ enum | |||
| 162 | IPV4_DEVCONF_SRC_VMARK, | 162 | IPV4_DEVCONF_SRC_VMARK, |
| 163 | IPV4_DEVCONF_PROXY_ARP_PVLAN, | 163 | IPV4_DEVCONF_PROXY_ARP_PVLAN, |
| 164 | IPV4_DEVCONF_ROUTE_LOCALNET, | 164 | IPV4_DEVCONF_ROUTE_LOCALNET, |
| 165 | IPV4_DEVCONF_IGMPV2_UNSOLICITED_REPORT_INTERVAL, | ||
| 166 | IPV4_DEVCONF_IGMPV3_UNSOLICITED_REPORT_INTERVAL, | ||
| 165 | __IPV4_DEVCONF_MAX | 167 | __IPV4_DEVCONF_MAX |
| 166 | }; | 168 | }; |
| 167 | 169 | ||