David S. Miller e86e180b82
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next ...
Pablo Neira Ayuso says:
====================
Netfilter/IPVS updates for net-next
The following patchset contains Netfilter/IPVS updates for net-next,
most relevantly they are:
* cleanup to remove double semicolon from stephen hemminger.
* calm down sparse warning in xt_ipcomp, from Fan Du.
* nf_ct_labels support for nf_tables, from Florian Westphal.
* new macros to simplify rcu dereferences in the scope of nfnetlink
and nf_tables, from Patrick McHardy.
* Accept queue and drop (including reason for drop) to verdict
parsing in nf_tables, also from Patrick.
* Remove unused random seed initialization in nfnetlink_log, from
Florian Westphal.
* Allow to attach user-specific information to nf_tables rules, useful
to attach user comments to rule, from me.
* Return errors in ipset according to the manpage documentation, from
Jozsef Kadlecsik.
* Fix coccinelle warnings related to incorrect bool type usage for ipset,
from Fengguang Wu.
* Add hash:ip,mark set type to ipset, from Vytas Dauksa.
* Fix message for each spotted by ipset for each netns that is created,
from Ilia Mirkin.
* Add forceadd option to ipset, which evicts a random entry from the set
if it becomes full, from Josh Hunt.
* Minor IPVS cleanups and fixes from Andi Kleen and Tingwei Liu.
* Improve conntrack scalability by removing a central spinlock, original
work from Eric Dumazet. Jesper Dangaard Brouer took them over to address
remaining issues. Several patches to prepare this change come in first
place.
* Rework nft_hash to resolve bugs (leaking chain, missing rcu synchronization
on element removal, etc. from Patrick McHardy.
* Restore context in the rule deletion path, as we now release rule objects
synchronously, from Patrick McHardy. This gets back event notification for
anonymous sets.
* Fix NAT family validation in nft_nat, also from Patrick.
* Improve scalability of xt_connlimit by using an array of spinlocks and
by introducing a rb-tree of hashtables for faster lookup of accounted
objects per network. This patch was preceded by several patches and
refactorizations to accomodate this change including the use of kmem_cache,
from Florian Westphal.
====================
Signed-off-by: David S. Miller <davem@davemloft.net >
2014-03-17 15:06:24 -04:00
2014-01-02 10:46:41 +01:00
2014-01-30 17:20:32 -08:00
2014-03-07 09:18:23 +01:00
2014-02-17 12:37:09 -08:00
2014-02-19 12:07:55 -07:00
2013-12-31 20:32:26 +02:00
2013-07-09 10:33:30 -07:00
2013-08-14 13:55:15 +05:30
2014-01-09 09:53:30 +09:00
2013-08-19 14:20:21 +05:30
2014-02-06 10:22:56 +01:00
2014-01-24 17:17:30 -08:00
2013-12-08 13:13:52 +00:00
2013-07-10 11:10:27 -07:00
2014-01-25 10:49:30 -08:00
2014-02-19 13:30:30 +00:00
2014-03-12 15:57:16 -04:00
2014-02-13 20:48:02 -08:00
2014-01-26 11:00:41 -08:00
2014-01-20 11:55:23 -08:00
2014-03-06 09:31:43 +01:00
2014-02-05 05:48:43 +00:00
2014-01-16 14:25:37 +01:00
2014-01-31 09:31:14 -08:00
2013-12-23 18:34:58 -08:00
2013-09-10 13:03:41 -07:00
2013-12-24 13:47:40 +00:00
2014-01-31 08:59:46 -08:00
2014-02-11 12:08:27 +00:00
2014-01-24 22:39:54 +01:00
2014-01-30 10:18:43 -08:00
2014-01-23 18:49:36 -08:00
2013-12-08 18:01:56 -08:00
2014-01-17 01:59:38 +01:00
2013-07-03 16:31:35 -07:00
2013-07-30 11:53:12 -04:00
2013-11-09 00:16:28 -05:00
2013-09-24 10:35:17 +01:00
2013-12-02 11:24:18 +00:00
2013-07-03 16:07:42 -07:00
2013-10-27 08:40:39 -04:00
2013-12-09 15:37:58 -05:00
2013-10-17 13:31:19 -07:00
2013-07-15 11:07:56 +01:00
2014-02-28 19:44:55 -08:00
2013-12-24 09:35:17 -08:00
2013-11-08 08:59:44 -07:00
2013-10-16 01:16:04 +02:00
2013-09-30 14:31:02 -07:00
2014-02-05 12:54:53 -08:00
2014-02-11 08:40:45 -07:00
2013-11-14 13:41:48 +09:00
2013-11-23 22:33:56 -08:00
2014-02-21 08:58:49 -08:00
2014-02-14 10:45:18 -08:00
2013-11-08 09:04:30 -07:00
2014-01-30 16:56:54 -08:00
2014-01-13 17:32:27 +01:00
2014-02-14 00:27:58 -05:00
2013-09-04 09:23:46 -04:00
2014-01-23 16:36:56 -08:00
2013-08-30 23:44:11 -07:00
2014-01-15 11:33:40 +08:00
2014-01-03 23:41:42 +01:00
2014-02-11 10:38:30 -05:00
2013-12-31 11:35:12 -08:00
2014-01-30 17:07:18 -08:00
2013-12-22 23:14:27 -08:00
2013-12-04 17:19:44 +01:00
2013-10-02 11:33:23 +02:00
2013-07-30 11:24:20 -07:00
2014-01-21 20:18:26 -08:00
2013-07-30 11:11:44 +02:00
2014-01-21 16:19:48 -08:00
2014-02-01 10:43:45 -08:00
2014-02-13 12:34:05 +01:00
2013-12-05 21:28:41 +08:00
2014-01-23 18:11:00 -08:00
2014-01-23 18:11:00 -08:00
2013-11-15 09:32:21 +09:00
2014-01-10 16:27:36 -08:00
2013-12-29 15:25:48 +01:00
2013-12-02 20:43:15 +01:00
2013-12-02 20:43:14 +01:00
2013-11-09 00:16:29 -05:00
2013-10-23 10:10:20 -07:00
2013-12-04 09:33:34 -04:00
2013-09-13 15:09:52 +02:00
2013-11-14 13:41:48 +09:00
2014-01-17 02:00:44 +01:00
2013-10-30 01:21:24 +01:00
2013-11-06 12:40:27 +01:00
2014-01-15 14:19:42 +07:00
2013-11-03 23:04:56 -05:00
2013-09-07 12:56:26 +10:00
2013-12-12 10:39:01 -08:00
2013-10-03 16:14:12 -07:00
2013-08-18 17:39:55 -07:00
2013-11-15 16:47:22 -08:00
2013-09-20 10:36:34 -04:00
2014-01-13 14:05:13 -08:00
2013-08-02 12:33:54 -07:00
2013-11-23 22:33:51 -08:00
2014-01-09 12:43:40 +01:00
2014-02-13 10:08:52 +05:30
2013-08-27 09:18:29 +02:00
2014-01-21 16:19:41 -08:00
2013-10-31 14:49:24 +00:00
2014-01-29 20:27:23 -08:00
2014-01-09 12:43:37 +01:00
2013-10-23 10:10:12 -07:00
2013-07-06 14:09:38 -07:00
2013-12-11 18:06:47 +01:00
2014-01-05 12:34:29 +01:00
2013-07-03 13:25:24 +02:00
2013-11-09 00:16:24 -05:00
2013-11-09 00:16:23 -05:00
2013-07-15 11:25:00 +09:30
2014-01-15 15:39:33 -08:00
2014-02-12 17:33:03 -05:00
2013-09-07 19:54:57 -04:00
2014-01-16 10:23:02 +10:30
2013-09-27 09:37:01 +09:00
2014-01-06 16:42:20 +09:00
2013-12-18 10:56:13 +10:00
2013-09-26 15:06:58 -07:00
2013-09-26 15:06:58 -07:00
2014-01-25 03:14:36 -05:00
2014-03-10 11:44:42 -04:00
2014-01-21 18:57:43 -08:00
2014-03-07 10:19:57 -05:00
2013-12-08 18:22:32 -08:00
2014-01-21 23:17:20 -08:00
2013-08-22 22:13:54 -07:00
2013-09-12 10:12:47 -07:00
2014-03-10 11:44:42 -04:00
2013-09-27 18:40:25 +01:00
2013-09-27 18:40:25 +01:00
2014-02-25 11:18:06 +01:00
2013-06-29 12:57:13 +04:00
2014-01-09 21:20:07 -05:00
2014-01-02 16:17:12 -05:00
2014-01-23 16:36:52 -08:00
2013-11-19 16:39:06 -05:00
2014-03-10 17:26:19 -07:00
2013-11-25 09:03:39 +01:00
2014-01-13 17:32:27 +01:00
2013-12-17 14:27:17 -05:00
2013-10-11 17:21:14 +11:00
2013-08-30 08:42:01 +10:00
2013-12-02 21:05:30 +00:00
2013-12-24 10:30:57 -08:00
2013-09-13 15:11:21 +02:00
2013-08-26 21:40:24 +02:00
2013-09-26 15:06:58 -07:00
2013-12-19 09:29:43 +01:00
2014-03-04 07:55:47 -08:00
2014-01-23 16:36:50 -08:00
2014-01-23 16:36:50 -08:00
2013-10-13 16:16:26 -07:00
2013-10-13 16:16:28 -07:00
2014-02-07 08:27:34 -08:00
2014-01-16 11:15:50 +01:00
2014-01-29 20:40:08 +01:00
2014-01-26 22:48:35 +01:00
2013-08-26 09:30:03 -07:00
2013-12-07 01:03:14 +01:00
2014-02-28 14:12:36 -05:00
2014-01-04 20:11:33 -05:00
2013-07-23 16:52:47 -07:00
2014-01-04 20:10:24 -05:00
2014-01-05 20:27:55 -05:00
2013-07-23 16:52:47 -07:00
2013-12-29 16:34:25 -05:00
2013-12-11 14:47:40 -05:00
2014-01-23 18:08:10 -08:00
2013-12-10 22:58:13 -08:00
2014-01-09 12:43:40 +01:00
2014-02-09 15:27:21 +01:00
2014-01-09 13:06:59 +01:00
2014-02-25 15:25:45 -08:00
2014-01-27 21:02:39 -08:00
2014-01-19 19:53:18 -08:00
2013-11-13 16:03:02 +01:00
2013-12-19 17:43:04 +00:00
2013-09-13 15:09:52 +02:00
2013-11-19 19:06:41 +01:00
2013-12-07 01:24:33 +01:00
2013-07-01 08:12:41 -04:00
2013-08-09 10:49:00 +02:00
2014-01-16 00:08:12 +01:00
2013-10-19 19:45:35 -04:00
2014-01-08 15:23:53 +00:00
2013-07-26 16:19:48 -07:00
2013-10-03 18:47:54 +02:00
2013-09-13 15:09:52 +02:00
2013-11-13 12:09:07 +09:00
2014-01-25 11:17:34 -08:00
2014-02-25 07:37:52 -08:00
2014-01-23 16:37:03 -08:00
2013-09-25 17:17:01 +01:00
2013-09-25 17:17:01 +01:00
2013-11-15 09:32:23 +09:00
2014-01-25 08:55:09 +01:00
2013-08-28 21:35:14 -07:00
2013-12-11 15:28:36 -08:00
2013-09-11 15:58:52 -07:00
2014-01-21 16:19:45 -08:00
2013-07-25 12:35:39 +02:00
2014-01-08 19:03:00 -02:00
2013-07-03 16:07:43 -07:00
2013-11-09 00:16:21 -05:00
2014-01-16 09:49:10 -05:00
2014-01-27 21:45:29 +01:00
2013-09-10 18:56:32 -04:00
2013-11-13 12:09:24 +09:00
2013-11-15 09:32:22 +09:00
2013-11-06 12:40:26 +01:00
2013-12-20 12:25:45 -08:00
2013-09-11 15:59:45 -07:00
2013-12-11 15:52:34 +01:00
2013-08-06 14:10:45 +00:00
2013-12-26 13:29:35 -05:00
2014-01-23 16:36:51 -08:00
2014-01-23 16:36:51 -08:00
2013-11-13 12:09:06 +09:00
2013-12-20 12:20:26 -08:00
2014-01-21 16:19:44 -08:00
2013-12-11 13:54:13 -05:00
2014-01-21 16:19:49 -08:00
2014-02-18 09:49:04 -08:00
2013-09-11 15:58:01 -07:00
2013-12-20 12:25:45 -08:00
2014-03-04 07:55:50 -08:00
2014-01-21 16:19:44 -08:00
2014-01-23 16:36:50 -08:00
2014-03-10 17:26:19 -07:00
2013-09-07 09:48:41 -07:00
2014-01-16 10:23:03 +10:30
2013-08-20 15:37:42 +09:30
2013-11-09 00:16:19 -05:00
2014-03-04 13:51:06 -05:00
2014-01-27 21:02:39 -08:00
2013-12-13 08:44:30 -07:00
2013-11-11 12:41:33 +01:00
2013-08-02 12:33:54 -07:00
2013-11-09 00:16:19 -05:00
2013-07-03 16:08:05 -07:00
2014-01-14 15:15:25 -08:00
2013-11-07 19:11:41 -05:00
2014-03-11 16:37:14 -04:00
2013-09-26 14:48:15 -07:00
2013-09-26 14:48:15 -07:00
2013-09-26 14:48:15 -07:00
2013-10-14 17:15:48 +02:00
2014-01-01 23:43:36 -05:00
2013-10-25 19:26:58 -04:00
2013-12-05 13:05:48 -08:00
2013-10-28 15:37:43 -04:00
2014-01-31 15:39:07 -08:00
2014-03-01 13:51:53 -06:00
2014-02-17 16:42:39 -05:00
2014-01-25 03:14:05 -05:00
2013-07-25 21:54:01 +02:00
2013-08-27 13:52:52 -04:00
2014-01-27 19:27:53 -05:00
2013-10-09 20:04:10 -05:00
2014-02-05 10:04:37 -06:00
2014-01-09 17:52:17 -06:00
2013-10-29 18:26:14 -07:00
2013-11-08 10:47:28 -06:00
2014-01-13 14:29:49 -08:00
2014-01-03 11:22:21 -08:00
2013-08-28 20:50:19 +01:00
2013-10-24 11:50:36 +01:00
2014-02-05 09:51:54 -06:00
2013-08-15 17:22:27 -07:00
2013-11-13 12:09:04 +09:00
2013-09-03 22:52:48 -04:00
2013-10-30 12:02:58 +08:00
2013-10-09 14:47:45 +02:00
2014-02-06 13:48:51 -08:00
2013-07-03 16:07:32 -07:00
2014-01-23 16:36:50 -08:00
2013-07-03 16:07:31 -07:00
2014-01-23 16:36:55 -08:00
2013-12-07 01:03:14 +01:00
2013-09-15 17:41:30 -04:00
2013-11-14 23:17:21 +01:00
2014-01-10 14:00:47 -07:00
2014-02-13 10:48:02 -07:00
2013-11-14 11:28:18 -07:00
2014-01-23 20:17:18 +00:00
2013-12-05 12:59:23 -05:00
2014-01-23 16:36:50 -08:00
2014-01-12 10:16:07 +01:00
2014-02-17 16:40:09 -05:00
2013-10-24 23:43:29 -04:00
2013-07-03 16:08:03 -07:00
2014-01-22 19:36:57 +01:00
2013-09-26 16:18:32 -07:00
2013-10-25 22:33:23 +02:00
2013-12-22 01:39:58 +01:00
2013-07-15 01:31:37 +02:00
2014-01-12 23:50:03 +01:00
2014-01-25 23:58:17 -05:00
2014-01-28 08:38:04 -08:00
2013-07-03 16:16:20 +02:00
2013-12-23 18:21:11 -08:00
2013-10-17 00:36:06 +02:00
2013-08-19 21:22:34 -07:00
2014-01-13 17:32:27 +01:00
2014-01-23 14:48:35 +01:00
2014-01-25 11:17:34 -08:00
2013-11-26 20:55:33 -08:00
2013-12-20 13:12:01 -08:00
2013-07-09 10:33:26 -07:00
2013-06-28 23:15:06 +02:00
2013-10-16 09:05:57 +02:00
2013-08-14 19:54:30 +01:00
2013-08-20 16:53:58 -05:00
2013-08-17 09:32:32 -04:00
2013-09-11 15:59:36 -07:00
2014-01-23 16:36:58 -08:00
2014-01-21 23:17:20 -08:00
2013-11-13 12:09:33 +09:00
2013-12-12 12:34:16 -08:00
2014-01-28 08:38:04 -08:00
2013-12-12 12:34:16 -08:00
2013-12-12 12:34:16 -08:00
2013-12-18 19:04:50 -08:00
2014-01-21 23:17:20 -08:00
2014-01-09 14:34:13 +00:00
2013-09-12 15:38:02 -07:00
2013-07-12 12:07:46 +02:00
2014-01-16 12:00:56 -08:00
2013-07-03 16:08:05 -07:00
2013-07-03 16:08:05 -07:00
2014-01-21 16:19:45 -08:00
2014-01-13 13:41:50 +01:00
2013-12-17 21:19:08 -08:00
2014-01-13 13:47:36 +01:00
2014-01-28 13:20:09 -08:00
2013-12-08 17:56:37 -08:00
2013-10-09 16:54:39 -07:00
2014-02-05 12:54:53 -08:00
2014-01-19 19:55:50 -08:00
2013-10-22 22:26:41 +11:00
2013-07-09 10:33:28 -07:00
2013-11-15 09:32:20 +09:00
2014-01-12 10:13:59 +01:00
2014-01-23 13:02:36 +01:00
2013-10-16 13:16:19 -07:00
2013-12-24 21:50:54 +09:00
2013-12-07 01:24:33 +01:00
2013-10-17 16:41:50 -07:00
2013-08-27 14:25:27 +05:30
2013-12-19 19:09:38 -05:00
2013-08-27 14:25:09 +05:30
2014-01-27 21:02:39 -08:00
2013-12-02 11:24:19 +00:00
2013-09-10 18:56:32 -04:00
2013-09-01 14:16:33 -07:00
2014-03-05 20:32:02 -05:00
2014-01-25 11:17:34 -08:00
2014-03-10 17:26:19 -07:00
2013-11-22 08:10:34 -08:00
2014-02-10 16:01:42 -08:00
2013-08-02 12:33:54 -07:00
2014-01-22 21:57:05 -08:00
2014-01-13 13:47:36 +01:00
2014-01-13 13:47:36 +01:00
2013-12-16 11:36:13 +01:00
2014-01-27 21:02:40 -08:00
2013-11-06 09:32:09 +02:00
2014-01-21 08:28:07 +00:00
2014-01-21 17:05:27 -08:00
2013-10-09 12:40:45 +02:00
2013-09-12 15:38:02 -07:00
2013-11-15 09:32:14 +09:00
2014-02-21 21:27:10 +01:00
2014-01-13 14:05:13 -08:00
2013-10-16 13:01:44 -07:00
2013-12-07 01:03:14 +01:00
2014-02-26 17:08:40 -05:00
2013-08-29 13:54:34 -07:00
2014-01-14 08:01:10 -08:00
2013-12-04 09:31:34 -04:00
2013-10-17 14:38:44 +02:00
2013-09-25 13:53:10 +02:00
2014-01-15 23:05:31 +01:00
2013-10-10 12:31:43 -07:00
2013-09-20 12:03:46 +02:00
2014-01-06 14:37:25 +01:00
2014-03-03 21:11:05 -05:00
2013-12-09 11:09:24 -08:00
2013-12-08 16:56:05 -08:00
2014-02-14 13:39:29 -08:00
2014-03-14 22:41:36 -04:00
2014-01-13 13:47:37 +01:00
2013-11-26 20:55:33 -08:00
2013-11-20 16:31:01 +01:00
2013-10-16 13:32:04 -07:00
2014-02-07 14:30:03 -08:00
2013-09-24 10:35:19 +01:00
2013-07-09 10:33:29 -07:00
2013-08-05 10:52:36 -06:00
2013-08-29 13:30:21 +10:00
2013-10-11 15:19:22 +10:00
2013-10-17 10:55:37 +10:30
2013-10-29 11:28:11 +10:30
2013-10-29 11:28:17 +10:30
2014-01-25 09:10:41 +01:00
2013-07-09 10:33:21 -07:00
2013-12-03 11:15:58 -08:00
2013-11-22 18:20:43 -05:00
2014-02-07 11:27:30 -08:00
2013-12-02 20:43:15 +01:00
2014-01-23 16:37:04 -08:00
2014-01-22 10:25:39 +01:00
2014-02-28 14:08:26 -05:00
2014-02-14 09:05:39 -05:00
2014-02-22 02:02:28 +01:00
2013-07-12 12:07:46 +02:00
2013-07-25 19:30:03 +10:00
2013-10-17 15:53:09 -04:00
2013-07-10 18:11:34 -07:00
2013-11-26 11:09:08 +01:00
2014-01-30 16:56:55 -08:00
e86e180b82