Florian Westphal
c055d5b03b
netfilter: bridge: query conntrack about skb dnat
...
ask conntrack instead of storing ipv4 address in nf_bridge_info->data.
Ths avoids the need to use ->data during NF_PRE_ROUTING.
Only two functions that need ->data remain.
These will be addressed in followup patches.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
2015-03-16 14:34:34 +01:00
..
acpi
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
2015-02-19 11:28:36 -08:00
asm-generic
OK, this has the big virtio 1.0 implementation, as specified by OASIS.
2015-02-18 09:24:01 -08:00
clocksource
crypto
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2015-02-14 09:47:01 -08:00
drm
drm/ttm: device address space != CPU address space
2015-03-05 09:04:39 +10:00
dt-bindings
The clock framework changes for 3.20 contain the usual driver additions,
2015-02-21 12:30:30 -08:00
keys
kvm
linux
netfilter: bridge: query conntrack about skb dnat
2015-03-16 14:34:34 +01:00
math-emu
media
memory
misc
net
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2015-03-10 12:48:47 -04:00
pcmcia
ras
rdma
rxrpc
scsi
Merge branch 'for-3.20/core' of git://git.kernel.dk/linux-block
2015-02-12 14:13:23 -08:00
soc
sound
target
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2015-02-21 13:21:19 -08:00
trace
Merge branch 'lazytime' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2015-02-17 16:12:34 -08:00
uapi
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-03-09 23:38:02 -04:00
video
OMAPDSS: fix regression with display sysfs files
2015-02-26 10:23:15 +02:00
xen
x86/xen: allow privcmd hypercalls to be preempted
2015-02-23 16:30:24 +00:00
Kbuild