diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-03-01 13:31:53 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-03-01 13:31:53 -0500 |
| commit | 04421fe2671c1790ab6529fad87ce8c73af0e1eb (patch) | |
| tree | d2f803b4eef6108648f1beee6bf97a342cd9bc73 /include/uapi/linux/netconf.h | |
| parent | 7fb45edba8b5206e645572a682c946f67375447e (diff) | |
| parent | cfbf8d4857c26a8a307fb7cd258074c9dcd8c691 (diff) | |
Merge tag 'v3.14-rc4' into next
Merge with Linux 3.14-rc4 to bring devm_request_any_context_irq().
Diffstat (limited to 'include/uapi/linux/netconf.h')
| -rw-r--r-- | include/uapi/linux/netconf.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/netconf.h b/include/uapi/linux/netconf.h index 64804a798b0c..669a1f0b1d97 100644 --- a/include/uapi/linux/netconf.h +++ b/include/uapi/linux/netconf.h | |||
| @@ -14,6 +14,7 @@ enum { | |||
| 14 | NETCONFA_FORWARDING, | 14 | NETCONFA_FORWARDING, |
| 15 | NETCONFA_RP_FILTER, | 15 | NETCONFA_RP_FILTER, |
| 16 | NETCONFA_MC_FORWARDING, | 16 | NETCONFA_MC_FORWARDING, |
| 17 | NETCONFA_PROXY_NEIGH, | ||
| 17 | __NETCONFA_MAX | 18 | __NETCONFA_MAX |
| 18 | }; | 19 | }; |
| 19 | #define NETCONFA_MAX (__NETCONFA_MAX - 1) | 20 | #define NETCONFA_MAX (__NETCONFA_MAX - 1) |