David S. Miller abccc5878a
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf ...
Pablo Neira Ayuso says:
====================
pull request: Netfilter/IPVS fixes for net
The following patchset contains seven Netfilter fixes for your net
tree, they are:
1) Make the NAT infrastructure independent of x_tables, some users are
already starting to test nf_tables with NAT without enabling x_tables.
Without this patch for Kconfig, there's a superfluous dependency
between NAT and x_tables.
2) Allow to use 0 in the cgroup match, the kernel rejects with -EINVAL
with no good reason. From Daniel Borkmann.
3) Select CONFIG_NF_NAT from the nf_tables NAT expression, this also
resolves another NAT dependency with x_tables.
4) Use HAVE_JUMP_LABEL instead of CONFIG_JUMP_LABEL in the Netfilter hook
code as elsewhere in the kernel to resolve toolchain problems, from
Zhouyi Zhou.
5) Use iptunnel_handle_offloads() to set up tunnel encapsulation
depending on the offload capabilities, reported by Alex Gartrell
patch from Julian Anastasov.
6) Fix wrong family when registering the ip_vs_local_reply6() hook,
also from Julian.
7) Select the NF_LOG_* symbols from NETFILTER_XT_TARGET_LOG. Rafał
Miłecki reported that when jumping from 3.16 to 3.17-rc, his log
target is not selected anymore due to changes in the previous
development cycle to accomodate the full logging support for
nf_tables.
====================
Signed-off-by: David S. Miller <davem@davemloft.net >
2014-09-02 13:56:30 -07:00
2014-06-10 10:28:45 -07:00
2014-07-31 13:45:32 -04:00
2014-08-06 18:01:23 -07:00
2014-07-08 15:08:45 +04:00
2014-07-25 15:16:27 -07:00
2014-08-08 15:57:26 -07:00
2014-07-23 10:22:35 +09:00
2014-08-07 11:54:51 +02:00
2014-08-09 09:15:07 -07:00
2014-08-05 17:46:42 -07:00
2014-08-07 23:37:07 -07:00
2014-08-05 17:38:45 -07:00
2014-08-07 17:17:39 -07:00
2014-08-29 20:13:00 -07:00
2014-08-06 09:38:14 -07:00
2014-08-11 11:42:39 +02:00
2014-07-21 19:39:55 -07:00
2014-07-22 12:46:11 +05:30
2014-07-11 14:08:26 +02:00
2014-08-14 09:15:53 -06:00
2014-08-05 18:29:21 +01:00
2014-08-06 09:38:14 -07:00
2014-07-18 13:45:24 -04:00
2014-08-13 18:13:19 -06:00
2014-08-06 09:38:14 -07:00
2014-08-07 14:40:09 -04:00
2014-08-09 09:15:07 -07:00
2014-07-30 10:42:55 -07:00
2014-07-30 15:39:46 -04:00
2014-07-09 16:02:41 +02:00
2014-07-07 21:34:43 -07:00
2014-06-21 11:37:35 +01:00
2014-07-01 10:36:47 -06:00
2014-08-06 18:01:27 -07:00
2014-06-12 10:30:18 -07:00
2014-06-17 22:12:35 -07:00
2014-07-01 10:34:38 -06:00
2014-08-16 19:13:33 -07:00
2014-07-24 21:53:47 +10:00
2014-07-15 11:05:10 -04:00
2014-07-02 16:15:55 -07:00
2014-07-23 15:01:52 -07:00
2014-08-06 18:01:16 -07:00
2014-06-12 19:18:49 -07:00
2014-07-03 11:32:43 +01:00
2014-06-25 13:26:47 -07:00
2014-06-06 16:08:18 -07:00
2014-07-21 13:43:19 +02:00
2014-06-09 18:10:34 -07:00
2014-06-12 14:27:40 -07:00
2014-06-25 16:04:00 -07:00
2014-07-17 16:15:35 -04:00
2014-08-01 22:35:55 +08:00
2014-08-07 14:40:10 -04:00
2014-08-05 15:59:35 -07:00
2014-07-08 13:36:52 -07:00
2014-08-06 18:01:16 -07:00
2014-06-05 15:57:04 -07:00
2014-08-11 07:14:01 -07:00
2014-07-23 16:04:47 +02:00
2014-07-10 18:35:01 +02:00
2014-07-10 18:35:01 +02:00
2014-07-10 18:35:23 +02:00
2014-06-26 15:46:55 -03:00
2014-08-08 15:57:33 -07:00
2014-06-22 16:34:11 -06:00
2014-07-01 13:32:32 +03:00
2014-07-08 13:41:08 -07:00
2014-08-02 15:03:58 -07:00
2014-07-08 15:28:16 -07:00
2014-08-07 14:40:08 -04:00
2014-08-11 11:44:11 -07:00
2014-08-06 18:01:12 -07:00
2014-08-09 17:33:44 -07:00
2014-07-23 15:03:00 -04:00
2014-08-06 18:01:15 -07:00
2014-08-06 18:01:24 -07:00
2014-08-08 17:39:48 -07:00
2014-08-06 18:01:22 -07:00
2014-08-04 10:07:36 +02:00
2014-07-23 10:17:54 -07:00
2014-08-06 18:01:19 -07:00
2014-08-06 18:01:19 -07:00
2014-07-15 04:49:40 -04:00
2014-08-19 10:19:39 -05:00
2014-06-06 16:08:13 -07:00
2014-07-21 12:14:04 +02:00
2014-07-08 16:12:53 -07:00
2014-08-11 12:16:51 -07:00
2014-07-25 11:47:46 -07:00
2014-07-09 09:15:01 -07:00
2014-07-04 12:35:59 +02:00
2014-06-12 13:46:37 +02:00
2014-07-23 12:02:30 +02:00
2014-07-08 09:40:06 +02:00
2014-08-08 15:57:32 -07:00
2014-07-23 16:04:47 +02:00
2014-07-07 21:14:21 -07:00
2014-06-16 16:26:54 +02:00
2014-07-17 13:30:00 +00:00
2014-06-21 23:03:36 +02:00
2014-08-02 15:03:58 -07:00
2014-08-10 21:31:58 -07:00
2014-07-10 11:38:23 -07:00
2014-08-08 15:57:33 -07:00
2014-07-22 21:46:08 +01:00
2014-07-22 21:55:45 +01:00
2014-08-06 18:01:24 -07:00
2014-06-06 16:08:17 -07:00
2014-06-12 19:18:49 -07:00
2014-07-28 14:16:30 -04:00
2014-07-23 10:17:54 -07:00
2014-08-06 14:24:47 +02:00
2014-07-03 12:02:14 -07:00
2014-07-23 10:30:34 -04:00
2014-08-06 18:01:24 -07:00
2014-06-06 16:08:07 -07:00
2014-08-06 18:01:15 -07:00
2014-08-08 15:57:18 -07:00
2014-08-06 18:01:21 -07:00
2014-07-11 18:27:56 -07:00
2014-08-08 15:57:23 -07:00
2014-08-08 15:57:27 -07:00
2014-08-06 18:01:18 -07:00
2014-08-06 18:01:22 -07:00
2014-08-06 18:01:20 -07:00
2014-07-27 20:52:44 +09:30
2014-07-27 20:52:42 +09:30
2014-07-17 22:07:37 +02:00
2014-08-11 11:44:11 -07:00
2014-07-03 16:55:07 -06:00
2014-07-17 12:32:47 +02:00
2014-07-16 12:58:36 +00:00
2014-07-24 01:15:04 -07:00
2014-07-31 21:34:20 -07:00
2014-08-25 10:45:28 +02:00
2014-06-06 19:22:49 -04:00
2014-07-12 18:41:25 -04:00
2014-08-03 17:14:13 -04:00
2014-08-03 17:05:25 -04:00
2014-07-12 18:41:25 -04:00
2014-07-22 15:05:06 -07:00
2014-08-06 18:01:21 -07:00
2014-07-29 18:08:50 -07:00
2014-06-13 10:43:34 -04:00
2014-07-23 12:02:30 +02:00
2014-07-26 00:21:41 +05:30
2014-07-29 21:26:45 -06:00
2014-07-02 00:24:14 -07:00
2014-07-07 13:33:46 +01:00
2014-08-01 12:22:21 -06:00
2014-08-11 14:06:23 +01:00
2014-07-09 14:58:37 +01:00
2014-07-21 23:32:51 -07:00
2014-06-10 14:35:22 -07:00
2014-07-29 12:38:07 +02:00
2014-08-06 18:01:21 -07:00
2014-07-16 13:28:05 +02:00
2014-08-08 15:57:18 -07:00
2014-08-06 18:01:17 -07:00
2014-08-06 18:01:20 -07:00
2014-07-10 16:49:15 -06:00
2014-07-23 01:00:45 +02:00
2014-08-04 17:32:24 -07:00
2014-07-09 14:58:37 +01:00
2014-08-04 10:09:27 -07:00
2014-06-28 08:10:14 -04:00
2014-06-17 19:12:39 -04:00
2014-06-06 07:56:22 +02:00
2014-06-05 15:38:57 -07:00
2014-07-30 20:00:21 -07:00
2014-08-04 10:07:11 -07:00
2014-07-08 15:31:26 -07:00
2014-07-23 01:00:36 +02:00
2014-07-18 23:40:23 +02:00
2014-08-13 15:13:44 +10:00
2014-07-07 16:57:18 -07:00
2014-07-03 17:27:23 -07:00
2014-07-15 22:40:22 +02:00
2014-06-25 11:22:03 -07:00
2014-08-06 18:01:24 -07:00
2014-07-09 09:14:17 -07:00
2014-07-25 19:01:53 +01:00
2014-07-08 13:41:08 -07:00
2014-08-14 15:13:39 -07:00
2014-06-10 09:46:00 -04:00
2014-08-08 15:57:24 -07:00
2014-06-19 21:17:37 -07:00
2014-06-21 22:05:30 +02:00
2014-07-10 12:37:33 -07:00
2014-07-16 14:56:55 +02:00
2014-07-16 14:57:13 +02:00
2014-08-08 15:57:26 -07:00
2014-08-14 18:13:46 -06:00
2014-07-18 12:13:40 -07:00
2014-07-30 01:31:46 +10:00
2014-08-05 17:46:42 -07:00
2014-07-08 12:50:59 -07:00
2014-07-17 18:23:35 -07:00
2014-07-17 18:21:21 -07:00
2014-07-23 01:10:45 +02:00
2014-07-09 10:55:57 +02:00
2014-07-02 16:01:51 +02:00
2014-08-08 15:57:26 -07:00
2014-08-08 15:57:31 -07:00
2014-08-06 13:03:44 +02:00
2014-08-11 12:16:51 -07:00
2014-06-06 16:08:18 -07:00
2014-06-27 11:47:58 -07:00
2014-06-12 00:21:11 -04:00
2014-07-31 14:13:29 -07:00
2014-06-16 23:29:39 +02:00
2014-08-08 15:57:17 -07:00
2014-08-08 15:57:32 -07:00
2014-08-08 15:57:24 -07:00
2014-06-27 15:53:35 -07:00
2014-07-22 10:12:05 +08:00
2014-08-04 16:23:30 -07:00
2014-07-23 10:17:53 -07:00
2014-07-23 10:17:54 -07:00
2014-07-30 09:26:25 +02:00
2014-07-23 15:01:55 -07:00
2014-07-18 11:49:57 +02:00
2014-07-29 23:10:56 +02:00
2014-07-01 07:13:39 -04:00
2014-08-06 13:03:43 +02:00
2014-08-07 20:39:36 -04:00
2014-07-10 16:05:19 -07:00
2014-07-11 17:54:28 -07:00
2014-08-07 14:40:11 -04:00
2014-06-12 19:18:49 -07:00
2014-06-30 22:47:18 -07:00
2014-08-08 15:57:22 -07:00
2014-07-09 14:58:37 +01:00
2014-08-08 10:39:16 -06:00
2014-08-06 18:01:19 -07:00
2014-07-16 15:10:41 +02:00
2014-07-16 15:10:39 +02:00
2014-08-06 18:01:23 -07:00
2014-08-08 15:57:26 -07:00
2014-08-06 18:01:23 -07:00
abccc5878a