On Fri, 2014-10-03 at 19:20 +0200, Pablo Neira Ayuso wrote: > Move nf_send_reset() and nf_send_reset6() to nf_reject_ipv4 and > nf_reject_ipv6 respectively. This code is shared by x_tables and > nf_tables. > > Signed-off-by: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx> > --- > include/net/netfilter/ipv4/nf_reject.h | 118 +---------------------- > net/ipv4/netfilter/Kconfig | 6 ++ > net/ipv4/netfilter/Makefile | 3 + > net/ipv4/netfilter/nf_reject_ipv4.c | 127 +++++++++++++++++++++++++ > net/ipv6/netfilter/Kconfig | 6 ++ > net/ipv6/netfilter/Makefile | 3 + > net/ipv6/netfilter/nf_reject_ipv6.c | 163 ++++++++++++++++++++++++++++++++ > 7 files changed, 309 insertions(+), 117 deletions(-) > create mode 100644 net/ipv4/netfilter/nf_reject_ipv4.c > create mode 100644 net/ipv6/netfilter/nf_reject_ipv6.c I am confused We now have two copies of nf_send_reset6() $ git grep -n nf_send_reset6 include/net/netfilter/ipv6/nf_reject.h:21:static void nf_send_reset6(struct net *net, struct sk_buff *oldskb, int hook) net/bridge/netfilter/nft_reject_bridge.c:49: nf_send_reset6(net, pkt->skb, pkt->ops->hooknum); net/ipv6/netfilter/ip6t_REJECT.c:66: nf_send_reset6(net, skb, par->hooknum); net/ipv6/netfilter/nf_reject_ipv6.c:14:void nf_send_reset6(struct net *net, struct sk_buff *oldskb, int hook) net/ipv6/netfilter/nf_reject_ipv6.c:163:EXPORT_SYMBOL_GPL(nf_send_reset6); net/ipv6/netfilter/nft_reject_ipv6.c:35: nf_send_reset6(net, pkt->skb, pkt->ops->hooknum); net/netfilter/nft_reject_inet.c:49: nf_send_reset6(net, pkt->skb, pkt->ops->hooknum); -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
