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/fib_rules.h | |
| parent | 9175c9d2aed528800175ef81c90569d00d23f9be (diff) | |
| parent | 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 (diff) | |
Merge tag 'v3.12'
Linux 3.12
Conflicts:
fs/exec.c
Diffstat (limited to 'include/uapi/linux/fib_rules.h')
| -rw-r--r-- | include/uapi/linux/fib_rules.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/uapi/linux/fib_rules.h b/include/uapi/linux/fib_rules.h index 51da65b68b85..2b82d7e30974 100644 --- a/include/uapi/linux/fib_rules.h +++ b/include/uapi/linux/fib_rules.h | |||
| @@ -44,8 +44,8 @@ enum { | |||
| 44 | FRA_FWMARK, /* mark */ | 44 | FRA_FWMARK, /* mark */ |
| 45 | FRA_FLOW, /* flow/class id */ | 45 | FRA_FLOW, /* flow/class id */ |
| 46 | FRA_UNUSED6, | 46 | FRA_UNUSED6, |
| 47 | FRA_UNUSED7, | 47 | FRA_SUPPRESS_IFGROUP, |
| 48 | FRA_UNUSED8, | 48 | FRA_SUPPRESS_PREFIXLEN, |
| 49 | FRA_TABLE, /* Extended table id */ | 49 | FRA_TABLE, /* Extended table id */ |
| 50 | FRA_FWMASK, /* mask for netfilter mark */ | 50 | FRA_FWMASK, /* mask for netfilter mark */ |
| 51 | FRA_OIFNAME, | 51 | FRA_OIFNAME, |