Patrick McHardy 1ab6b2a5a0 netfilter: don't reset nf_trace in nf_reset() ... [ Upstream commit 124dff01af ] Commit 130549fe ("netfilter: reset nf_trace in nf_reset") added code to reset nf_trace in nf_reset(). This is wrong and unnecessary. nf_reset() is used in the following cases: - when passing packets up the the socket layer, at which point we want to release all netfilter references that might keep modules pinned while the packet is queued. nf_trace doesn't matter anymore at this point. - when encapsulating or decapsulating IPsec packets. We want to continue tracing these packets after IPsec processing. - when passing packets through virtual network devices. Only devices on that encapsulate in IPv4/v6 matter since otherwise nf_trace is not used anymore. Its not entirely clear whether those packets should be traced after that, however we've always done that. - when passing packets through virtual network devices that make the packet cross network namespace boundaries. This is the only cases where we clearly want to reset nf_trace and is also what the original patch intended to fix. Add a new function nf_reset_trace() and use it in dev_forward_skb() to fix this properly. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2013-05-01 09:41:07 -07:00
..
acpi	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2012-05-05 10:06:06 -07:00
asm-generic	signal: Define __ARCH_HAS_SA_RESTORER so we know whether to clear sa_restorer	2013-04-05 10:04:14 -07:00
crypto	crypto: user - Fix lookup of algorithms with IV generator	2012-03-29 19:52:47 +08:00
drm	drm/radeon: add Richland pci ids	2013-03-28 12:12:13 -07:00
keys
linux	netfilter: don't reset nf_trace in nf_reset()	2013-05-01 09:41:07 -07:00
math-emu
media	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-05-14 11:23:37 -07:00
misc
mtd
net	inet: limit length of fragment queue hash table bucket lists	2013-03-28 12:11:54 -07:00
pcmcia
rdma	infiniband: pass rdma_cm module to netlink_dump_start	2012-10-28 10:14:15 -07:00
rxrpc
scsi	SCSI: libsas: fix taskfile corruption in sas_ata_qc_fill_rtf	2012-07-16 09:04:37 -07:00
sound	ALSA: Add a reference counter to card instance	2012-11-17 13:16:13 -08:00
target	target: Add link_magic for fabric allow_link destination target_items	2013-01-21 11:45:24 -08:00
trace	xen/mmu: Use Xen specific TLB flush instead of the generic one.	2012-11-17 13:15:54 -08:00
video	atmel_lcdfb: fix 16-bpp modes on older SOCs	2013-03-20 13:05:00 -07:00
xen	xen/blkback: correctly respond to unknown, non-native requests	2013-04-05 10:04:18 -07:00
Kbuild