From: David S. Miller <davem@davemloft.net>
Date: Tue, 20 Aug 2013 20:30:54 +0000 (-0700)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=89d5e23210f53ab53b7ff64843bce62a106d454f;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'master' of git://git./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>
---

89d5e23210f53ab53b7ff64843bce62a106d454f
diff --cc net/netfilter/nf_conntrack_proto_tcp.c
index 2f8010707d01,8f308d896324..d224e001f14f
--- a/net/netfilter/nf_conntrack_proto_tcp.c
+++ b/net/netfilter/nf_conntrack_proto_tcp.c
@@@ -525,8 -525,8 +525,8 @@@ static bool tcp_in_window(const struct 
  	struct ip_ct_tcp_state *receiver = &state->seen[!dir];
  	const struct nf_conntrack_tuple *tuple = &ct->tuplehash[dir].tuple;
  	__u32 seq, ack, sack, end, win, swin;
- 	s16 receiver_offset;
+ 	s32 receiver_offset;
 -	bool res;
 +	bool res, in_recv_win;
  
  	/*
  	 * Get the required data from the packet.