Florian Westphal faecbb45eb Revert "netfilter: bridge: query conntrack about skb dnat" ... This reverts commit c055d5b03b. There are two issues: 'dnat_took_place' made me think that this is related to -j DNAT/MASQUERADE. But thats only one part of the story. This is also relevant for SNAT when we undo snat translation in reverse/reply direction. Furthermore, I originally wanted to do this mainly to avoid storing ipv6 addresses once we make DNAT/REDIRECT work for ipv6 on bridges. However, I forgot about SNPT/DNPT which is stateless. So we can't escape storing address for ipv6 anyway. Might as well do it for ipv4 too. Reported-and-tested-by: Bernhard Thaler <bernhard.thaler@wvnet.at> Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>		2015-05-20 13:51:25 +02:00
..
acpi	ACPICA: remove duplicate u8 typedef	2015-04-28 23:58:54 +02:00
asm-generic	TTY/Serial patches for 4.1-rc1	2015-04-21 09:33:10 -07:00
clocksource
crypto	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2015-04-15 10:42:15 -07:00
drm	Merge tag 'topic/drm-misc-2015-04-15' of git://anongit.freedesktop.org/drm-intel into drm-next	2015-04-16 08:34:24 +10:00
dt-bindings	Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma	2015-04-24 09:49:37 -07:00
keys
kvm	KVM/ARM changes for v4.1:	2015-04-07 18:09:20 +02:00
linux	Revert "netfilter: bridge: query conntrack about skb dnat"	2015-05-20 13:51:25 +02:00
math-emu
media	Merge branch 'patchwork' into v4l_for_linus	2015-04-21 06:12:35 -03:00
memory
misc
net	We have only a few fixes right now:	2015-05-04 16:00:55 -04:00
pcmcia
ras
rdma	IB/core: Fix unaligned accesses	2015-05-05 13:21:27 -04:00
rxrpc	RxRPC: Handle VERSION Rx protocol packets	2015-04-01 16:31:26 +01:00
scsi	SCSI: add 1024 max sectors black list flag	2015-04-27 09:38:06 -07:00
soc
sound	ASoC: Fixes for v4.1	2015-04-30 19:08:06 +02:00
target	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	2015-04-24 10:22:09 -07:00
trace	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2015-04-26 17:22:07 -07:00
uapi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf	2015-05-16 16:40:22 -04:00
video	fbdev changes for v4.1	2015-04-20 15:16:25 -07:00
xen	xen: Suspend ticks on all CPUs during suspend	2015-04-29 17:10:05 +01:00
Kbuild