diff options
| author | Florian Westphal <fw@strlen.de> | 2013-07-29 15:41:52 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-07-31 16:39:40 +0200 |
| commit | fd158d79d33d3c8b693e3e2d8c0e3068d529c2dc (patch) | |
| tree | 3dce8e6eb4f057fc2924da1535ef5ac10c78be5c /net/netfilter/Makefile | |
| parent | 957bec36855f97cc5797fbaaf68b11ac7454df2d (diff) | |
| download | op-kernel-dev-fd158d79d33d3c8b693e3e2d8c0e3068d529c2dc.zip op-kernel-dev-fd158d79d33d3c8b693e3e2d8c0e3068d529c2dc.tar.gz | |
netfilter: tproxy: remove nf_tproxy_core, keep tw sk assigned to skb
The module was "permanent", due to the special tproxy skb->destructor.
Nowadays we have tcp early demux and its sock_edemux destructor in
networking core which can be used instead.
Thanks to early demux changes the input path now also handles
"skb->sk is tw socket" correctly, so this no longer needs the special
handling introduced with commit d503b30bd648b3cb4e5f50b65d27e389960cc6d9
(netfilter: tproxy: do not assign timewait sockets to skb->sk).
Thus:
- move assign_sock function to where its needed
- don't prevent timewait sockets from being assigned to the skb
- remove nf_tproxy_core.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter/Makefile')
| -rw-r--r-- | net/netfilter/Makefile | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile index a1abf87..ebfa7dc 100644 --- a/net/netfilter/Makefile +++ b/net/netfilter/Makefile @@ -61,9 +61,6 @@ obj-$(CONFIG_NF_NAT_IRC) += nf_nat_irc.o obj-$(CONFIG_NF_NAT_SIP) += nf_nat_sip.o obj-$(CONFIG_NF_NAT_TFTP) += nf_nat_tftp.o -# transparent proxy support -obj-$(CONFIG_NETFILTER_TPROXY) += nf_tproxy_core.o - # generic X tables obj-$(CONFIG_NETFILTER_XTABLES) += x_tables.o xt_tcpudp.o |
