From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Engelhardt Subject: nf-next: TEE only Date: Wed, 14 Apr 2010 01:21:42 +0200 Message-ID: <1271200907-5262-1-git-send-email-jengelh@medozas.de> Cc: netfilter-devel@vger.kernel.org To: kaber@trash.net Return-path: Received: from borg.medozas.de ([188.40.89.202]:33999 "EHLO borg.medozas.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753044Ab0DMXVw (ORCPT ); Tue, 13 Apr 2010 19:21:52 -0400 Sender: netfilter-devel-owner@vger.kernel.org List-ID: Hi, in this round: - use IP6SKB_REROUTED in v6 code - pick_net function: use skb->dev or skb->dst->dev when available (or completely fall back to init_net in case there's something going on) ---- The following changes since commit 9c6eb28aca52d562f3ffbaebaa56385df9972a43: Jan Engelhardt (1): netfilter: ipv6: add IPSKB_REROUTED exclusion to NF_HOOK/POSTROUTING invocation are available in the git repository at: git://dev.medozas.de/linux master Jan Engelhardt (4): netfilter: xtables: inclusion of xt_TEE netfilter: xtables2: make ip_tables reentrant netfilter: xt_TEE: have cloned packet travel through Xtables too netfilter: xtables: remove old comments about reentrancy include/linux/netfilter/Kbuild | 1 + include/linux/netfilter/x_tables.h | 7 + include/linux/netfilter/xt_TEE.h | 8 ++ net/ipv4/netfilter/arp_tables.c | 6 +- net/ipv4/netfilter/ip_tables.c | 67 ++++++----- net/ipv4/netfilter/ipt_REJECT.c | 3 - net/ipv6/netfilter/ip6_tables.c | 58 ++++------ net/ipv6/netfilter/ip6t_REJECT.c | 3 - net/netfilter/Kconfig | 7 + net/netfilter/Makefile | 1 + net/netfilter/x_tables.c | 77 ++++++++++++ net/netfilter/xt_TEE.c | 228 ++++++++++++++++++++++++++++++++++++ 12 files changed, 390 insertions(+), 76 deletions(-) create mode 100644 include/linux/netfilter/xt_TEE.h create mode 100644 net/netfilter/xt_TEE.c