David S. Miller 89d5e23210
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next ...
Conflicts:
net/netfilter/nf_conntrack_proto_tcp.c
The conflict had to do with overlapping changes dealing with
fixing the use of an "s32" to hold the value returned by
NAT_OFFSET().
Pablo Neira Ayuso says:
====================
The following batch contains Netfilter/IPVS updates for your net-next tree.
More specifically, they are:
* Trivial typo fix in xt_addrtype, from Phil Oester.
* Remove net_ratelimit in the conntrack logging for consistency with other
logging subsystem, from Patrick McHardy.
* Remove unneeded includes from the recently added xt_connlabel support, from
Florian Westphal.
* Allow to update conntracks via nfqueue, don't need NFQA_CFG_F_CONNTRACK for
this, from Florian Westphal.
* Remove tproxy core, now that we have socket early demux, from Florian
Westphal.
* A couple of patches to refactor conntrack event reporting to save a good
bunch of lines, from Florian Westphal.
* Fix missing locking in NAT sequence adjustment, it did not manifested in
any known bug so far, from Patrick McHardy.
* Change sequence number adjustment variable to 32 bits, to delay the
possible early overflow in long standing connections, also from Patrick.
* Comestic cleanups for IPVS, from Dragos Foianu.
* Fix possible null dereference in IPVS in the SH scheduler, from Daniel
Borkmann.
* Allow to attach conntrack expectations via nfqueue. Before this patch, you
had to use ctnetlink instead, thus, we save the conntrack lookup.
* Export xt_rpfilter and xt_HMARK header files, from Nicolas Dichtel.
====================
Signed-off-by: David S. Miller <davem@davemloft.net >
2013-08-20 13:30:54 -07:00
2013-07-05 11:40:47 +05:30
2013-07-22 16:54:40 -04:00
2013-06-27 15:15:32 +02:00
2013-07-09 12:18:06 -07:00
2013-07-03 11:54:50 -07:00
2013-07-09 10:33:30 -07:00
2013-06-20 10:26:29 +02:00
2013-07-20 10:18:53 +01:00
2013-07-10 11:10:27 -07:00
2013-08-05 14:04:24 +08:00
2013-08-02 12:33:54 -07:00
2013-08-15 15:42:57 -07:00
2013-07-05 12:48:35 -04:00
2013-05-09 10:15:46 -07:00
2013-08-14 10:48:05 +02:00
2013-06-25 15:34:44 +02:00
2013-07-23 12:15:15 -07:00
2013-06-10 10:46:18 -07:00
2013-07-01 11:17:08 +01:00
2013-06-26 16:21:06 +01:00
2013-06-17 14:38:54 -04:00
2013-08-07 17:07:18 -04:00
2013-07-27 20:10:57 -07:00
2013-08-02 12:33:54 -07:00
2013-05-14 10:23:57 +05:30
2013-07-26 14:59:20 +02:00
2013-07-03 16:31:35 -07:00
2013-05-07 19:46:02 -07:00
2013-05-29 12:57:34 -07:00
2013-05-29 15:50:34 -04:00
2013-07-03 16:07:42 -07:00
2013-07-09 10:33:19 -07:00
2013-07-03 16:07:43 -07:00
2013-07-08 01:23:15 -07:00
2013-05-08 10:13:35 -07:00
2013-05-08 10:13:35 -07:00
2013-07-03 16:07:39 -07:00
2013-05-15 14:42:15 -07:00
2013-07-03 16:07:29 -07:00
2013-07-09 16:30:35 -07:00
2013-07-23 15:48:35 -07:00
2013-06-15 20:23:53 -07:00
2013-05-16 11:09:18 +02:00
2013-07-05 11:09:28 +02:00
2013-05-09 13:46:38 -04:00
2013-06-19 12:58:42 +02:00
2013-05-20 12:27:59 -07:00
2013-05-31 11:32:30 +02:00
2013-07-08 10:13:40 -04:00
2013-07-14 19:36:59 -04:00
2013-07-04 13:12:44 +02:00
2013-06-11 13:42:38 +02:00
2013-07-24 17:04:16 +10:00
2013-07-20 05:06:27 +04:00
2013-05-12 14:16:21 +02:00
2013-06-03 13:55:01 -07:00
2013-06-03 20:20:29 +09:00
2013-07-10 23:41:18 +01:00
2013-07-16 10:57:37 -07:00
2013-08-02 12:33:54 -07:00
2013-07-03 16:07:42 -07:00
2013-06-28 16:04:36 +02:00
2013-06-28 16:04:36 +02:00
2013-06-28 16:04:36 +02:00
2013-07-06 14:09:38 -07:00
2013-07-23 16:01:28 -07:00
2013-07-06 14:09:38 -07:00
2013-07-03 13:25:24 +02:00
2013-07-03 16:07:41 -07:00
2013-05-07 18:38:27 -07:00
2013-05-28 15:03:04 +09:00
2013-06-27 16:53:30 +08:00
2013-06-19 16:49:39 -07:00
2013-07-27 20:24:36 +02:00
2013-06-06 12:41:57 -07:00
2013-06-17 16:38:57 -07:00
2013-06-19 20:30:32 -07:00
2013-05-12 14:16:22 +02:00
2013-08-02 12:33:54 -07:00
2013-07-14 11:42:26 -07:00
2013-06-19 14:16:47 +01:00
2013-06-29 12:57:13 +04:00
2013-08-02 22:28:41 -04:00
2013-06-19 23:32:07 -04:00
2013-07-09 10:33:21 -07:00
2013-06-10 13:45:49 -07:00
2013-07-04 10:29:23 -07:00
2013-07-03 16:07:32 -07:00
2013-06-03 14:09:14 -07:00
2013-05-08 11:51:05 -07:00
2013-08-12 14:45:06 -04:00
2013-06-05 12:00:27 -07:00
2013-06-13 17:51:04 -07:00
2013-06-25 16:44:56 -07:00
2013-07-23 16:52:47 -07:00
2013-07-18 13:05:23 -07:00
2013-07-23 16:52:47 -07:00
2013-08-09 11:27:46 -07:00
2013-06-26 12:13:18 -04:00
2013-05-31 13:02:52 +10:00
2013-06-17 16:38:57 -07:00
2013-08-13 17:05:04 -07:00
2013-06-25 11:48:24 +02:00
2013-06-06 10:23:58 +09:00
2013-06-24 14:02:41 +01:00
2013-07-01 08:12:41 -04:00
2013-06-12 23:02:35 -04:00
2013-06-12 23:02:35 -04:00
2013-07-02 15:53:53 -07:00
2013-05-13 09:45:01 -04:00
2013-08-02 22:38:10 -04:00
2013-05-16 07:55:07 -07:00
2013-07-09 18:24:39 -07:00
2013-07-03 13:21:40 -07:00
2013-07-03 16:07:43 -07:00
2013-06-06 14:05:23 -07:00
2013-07-16 22:00:14 -07:00
2013-07-13 13:29:32 +04:00
2013-07-09 10:33:30 -07:00
2013-05-31 00:48:22 -07:00
2013-06-12 16:29:47 -07:00
2013-07-03 16:07:26 -07:00
2013-06-01 22:24:07 +02:00
2013-06-01 21:37:09 +02:00
2013-07-10 18:11:34 -07:00
2013-07-09 10:33:23 -07:00
2013-07-03 16:07:32 -07:00
2013-07-09 10:33:22 -07:00
2013-07-18 16:21:59 -04:00
2013-07-02 15:38:19 +09:30
2013-05-28 11:31:16 -06:00
2013-06-26 12:10:56 +02:00
2013-07-12 12:07:46 +02:00
2013-08-02 12:33:54 -07:00
2013-07-03 16:08:05 -07:00
2013-06-04 15:17:38 -07:00
2013-05-27 22:50:59 -07:00
2013-08-03 21:36:46 -07:00
2013-05-23 11:58:55 +02:00
2013-08-13 16:32:10 +02:00
2013-06-27 22:44:16 -07:00
2013-05-27 23:18:50 -07:00
2013-06-08 16:20:14 -04:00
2013-06-08 16:20:16 -04:00
2013-07-09 17:17:07 -04:00
2013-06-28 16:29:51 -04:00
2013-06-20 15:41:18 +02:00
2013-05-08 09:55:05 -04:00
2013-05-19 20:29:55 +00:00
2013-06-12 12:37:40 +01:00
2013-06-12 07:49:19 +05:30
2013-05-19 20:30:10 +00:00
2013-06-12 12:37:30 +01:00
2013-05-07 11:22:14 -07:00
2013-06-11 11:41:51 -05:00
2013-07-03 16:07:32 -07:00
2013-07-03 16:07:31 -07:00
2013-07-30 18:30:34 -07:00
2013-06-26 15:55:52 -06:00
2013-05-17 14:12:06 -06:00
2013-07-31 00:30:20 -07:00
2013-06-16 16:12:26 -07:00
2013-07-14 19:36:59 -04:00
2013-05-31 17:19:05 -07:00
2013-05-07 20:16:25 -07:00
2013-07-03 16:08:03 -07:00
2013-07-04 15:51:45 -07:00
2013-06-03 21:49:52 +02:00
2013-07-15 01:31:37 +02:00
2013-07-03 16:16:20 +02:00
2013-06-28 18:20:52 -07:00
2013-06-19 12:55:10 +02:00
2013-05-22 01:34:24 +02:00
2013-07-01 18:10:48 +10:00
2013-07-09 10:33:26 -07:00
2013-06-28 23:15:06 +02:00
2013-06-21 11:32:51 +02:00
2013-05-07 18:38:27 -07:00
2013-06-02 20:53:59 -07:00
2013-05-28 22:47:13 -04:00
2013-06-10 13:45:52 -07:00
2013-06-10 13:45:52 -07:00
2013-06-10 13:45:52 -07:00
2013-07-09 10:33:29 -07:00
2013-08-06 19:49:46 +01:00
2013-07-12 12:07:46 +02:00
2013-05-24 16:22:50 -07:00
2013-07-03 16:08:05 -07:00
2013-07-03 16:08:05 -07:00
2013-07-09 10:33:30 -07:00
2013-06-12 14:02:13 -07:00
2013-08-14 10:04:43 -07:00
2013-06-17 16:38:57 -07:00
2013-07-09 12:09:43 -07:00
2013-07-09 10:33:28 -07:00
2013-07-08 13:36:41 +04:00
2013-05-20 11:47:21 -07:00
2013-06-17 18:09:53 +09:00
2013-07-05 11:40:59 +05:30
2013-08-02 12:33:54 -07:00
2013-07-22 19:40:01 -07:00
2013-08-07 16:52:34 -07:00
2013-07-07 19:02:59 +03:00
2013-07-07 19:02:59 +03:00
2013-07-03 16:07:22 -07:00
2013-08-02 12:33:54 -07:00
2013-08-07 16:52:33 -07:00
2013-06-19 23:34:50 +02:00
2013-06-19 12:58:42 +02:00
2013-08-13 08:19:26 -07:00
2013-06-20 19:02:45 +04:00
2013-06-10 13:45:25 -07:00
2013-07-04 14:34:17 -07:00
2013-06-21 00:35:12 +02:00
2013-07-03 16:07:32 -07:00
2013-08-13 17:57:47 -07:00
2013-08-13 17:57:48 -07:00
2013-07-16 10:57:37 -07:00
2013-06-12 16:29:44 -07:00
2013-07-31 12:16:45 -07:00
2013-05-09 09:40:49 -07:00
2013-07-29 13:32:29 +02:00
2013-05-14 20:54:06 +02:00
2013-05-21 12:25:02 -05:00
2013-06-20 22:24:32 -07:00
2013-06-17 12:55:11 -07:00
2013-06-17 12:55:11 -07:00
2013-05-20 10:24:22 +09:30
2013-07-16 15:33:02 -07:00
2013-08-08 13:11:39 -07:00
2013-07-09 10:33:29 -07:00
2013-07-09 10:47:53 +09:30
2013-07-09 18:24:39 -07:00
2013-07-09 10:33:21 -07:00
2013-07-31 14:41:04 -07:00
2013-05-27 10:57:53 +09:00
2013-05-31 11:31:50 +02:00
2013-07-02 09:52:47 -07:00
2013-07-03 16:07:41 -07:00
2013-07-09 10:33:22 -07:00
2013-07-12 12:07:46 +02:00
2013-07-10 18:11:34 -07:00
89d5e23210