* [PATCH net-next] netfilter: remove dead code
@ 2013-12-31 1:16 Stephen Hemminger
2014-01-03 22:53 ` Pablo Neira Ayuso
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Hemminger @ 2013-12-31 1:16 UTC (permalink / raw)
To: Pablo Neira Ayuso; +Cc: netfilter-devel
The following code is not used in current upstream code.
Some of this seems to be old hooks, other might be used by some
out of tree module (which I don't care about breaking), and
the need_ipv4_conntrack was used by old NAT code but no longer
called.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
--- a/net/netfilter/nf_conntrack_core.c 2013-12-30 15:37:28.704768854 -0800
+++ b/net/netfilter/nf_conntrack_core.c 2013-12-30 17:03:14.891304019 -0800
@@ -60,12 +60,6 @@ int (*nfnetlink_parse_nat_setup_hook)(st
const struct nlattr *attr) __read_mostly;
EXPORT_SYMBOL_GPL(nfnetlink_parse_nat_setup_hook);
-int (*nf_nat_seq_adjust_hook)(struct sk_buff *skb,
- struct nf_conn *ct,
- enum ip_conntrack_info ctinfo,
- unsigned int protoff);
-EXPORT_SYMBOL_GPL(nf_nat_seq_adjust_hook);
-
DEFINE_SPINLOCK(nf_conntrack_lock);
EXPORT_SYMBOL_GPL(nf_conntrack_lock);
@@ -361,15 +355,6 @@ begin:
return NULL;
}
-struct nf_conntrack_tuple_hash *
-__nf_conntrack_find(struct net *net, u16 zone,
- const struct nf_conntrack_tuple *tuple)
-{
- return ____nf_conntrack_find(net, zone, tuple,
- hash_conntrack_raw(tuple, zone));
-}
-EXPORT_SYMBOL_GPL(__nf_conntrack_find);
-
/* Find a connection corresponding to a tuple. */
static struct nf_conntrack_tuple_hash *
__nf_conntrack_find_get(struct net *net, u16 zone,
--- a/include/net/netfilter/nf_conntrack_l3proto.h 2013-12-30 17:02:46.135751699 -0800
+++ b/include/net/netfilter/nf_conntrack_l3proto.h 2013-12-30 17:03:14.891304019 -0800
@@ -87,7 +87,6 @@ int nf_ct_l3proto_register(struct nf_con
void nf_ct_l3proto_unregister(struct nf_conntrack_l3proto *proto);
struct nf_conntrack_l3proto *nf_ct_l3proto_find_get(u_int16_t l3proto);
-void nf_ct_l3proto_put(struct nf_conntrack_l3proto *p);
/* Existing built-in protocols */
extern struct nf_conntrack_l3proto nf_conntrack_l3proto_generic;
--- a/net/netfilter/nf_conntrack_proto.c 2013-12-30 17:02:46.135751699 -0800
+++ b/net/netfilter/nf_conntrack_proto.c 2013-12-30 17:03:14.891304019 -0800
@@ -92,12 +92,6 @@ nf_ct_l3proto_find_get(u_int16_t l3proto
}
EXPORT_SYMBOL_GPL(nf_ct_l3proto_find_get);
-void nf_ct_l3proto_put(struct nf_conntrack_l3proto *p)
-{
- module_put(p->me);
-}
-EXPORT_SYMBOL_GPL(nf_ct_l3proto_put);
-
int
nf_ct_l3proto_try_module_get(unsigned short l3proto)
{
--- a/include/net/netfilter/ipv4/nf_conntrack_ipv4.h 2013-12-30 15:37:28.704768854 -0800
+++ b/include/net/netfilter/ipv4/nf_conntrack_ipv4.h 2013-12-30 17:05:52.272854228 -0800
@@ -19,6 +19,4 @@ extern struct nf_conntrack_l4proto nf_co
int nf_conntrack_ipv4_compat_init(void);
void nf_conntrack_ipv4_compat_fini(void);
-void need_ipv4_conntrack(void);
-
#endif /*_NF_CONNTRACK_IPV4_H*/
--- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c 2013-12-30 15:37:28.704768854 -0800
+++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c 2013-12-30 17:07:29.067347857 -0800
@@ -548,9 +548,3 @@ static void __exit nf_conntrack_l3proto_
module_init(nf_conntrack_l3proto_ipv4_init);
module_exit(nf_conntrack_l3proto_ipv4_fini);
-
-void need_ipv4_conntrack(void)
-{
- return;
-}
-EXPORT_SYMBOL_GPL(need_ipv4_conntrack);
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next] netfilter: remove dead code
2013-12-31 1:16 Stephen Hemminger
@ 2014-01-03 22:53 ` Pablo Neira Ayuso
0 siblings, 0 replies; 6+ messages in thread
From: Pablo Neira Ayuso @ 2014-01-03 22:53 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: netfilter-devel
On Mon, Dec 30, 2013 at 05:16:08PM -0800, Stephen Hemminger wrote:
> The following code is not used in current upstream code.
> Some of this seems to be old hooks, other might be used by some
> out of tree module (which I don't care about breaking), and
> the need_ipv4_conntrack was used by old NAT code but no longer
> called.
Also applied, thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH net-next] netfilter: remove dead code
@ 2015-09-30 0:25 Flavio Leitner
2015-09-30 0:45 ` Florian Westphal
0 siblings, 1 reply; 6+ messages in thread
From: Flavio Leitner @ 2015-09-30 0:25 UTC (permalink / raw)
To: netdev; +Cc: Flavio Leitner
Remove __nf_conntrack_find() from headers.
Fixes: dcd93ed4cd1 ("netfilter: nf_conntrack: remove dead code"
Signed-off-by: Flavio Leitner <fbl@redhat.com>
---
include/net/netfilter/nf_conntrack.h | 4 ----
1 file changed, 4 deletions(-)
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h
index d642f68..fde4068 100644
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
@@ -183,10 +183,6 @@ void *nf_ct_alloc_hashtable(unsigned int *sizep, int nulls);
void nf_ct_free_hashtable(void *hash, unsigned int size);
-struct nf_conntrack_tuple_hash *
-__nf_conntrack_find(struct net *net, u16 zone,
- const struct nf_conntrack_tuple *tuple);
-
int nf_conntrack_hash_check_insert(struct nf_conn *ct);
bool nf_ct_delete(struct nf_conn *ct, u32 pid, int report);
--
2.4.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH net-next] netfilter: remove dead code
2015-09-30 0:25 [PATCH net-next] netfilter: remove dead code Flavio Leitner
@ 2015-09-30 0:45 ` Florian Westphal
2015-09-30 4:54 ` David Miller
0 siblings, 1 reply; 6+ messages in thread
From: Florian Westphal @ 2015-09-30 0:45 UTC (permalink / raw)
To: Flavio Leitner; +Cc: netdev
Flavio Leitner <fbl@redhat.com> wrote:
> Remove __nf_conntrack_find() from headers.
> Fixes: dcd93ed4cd1 ("netfilter: nf_conntrack: remove dead code"
For the record: netfilter patches should go to
netfilter-devel@vger.kernel.org .
That being said, in this case I doubt Pablo minds if David takes this
directly, patch ts obviously correct[tm] :)
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next] netfilter: remove dead code
2015-09-30 0:45 ` Florian Westphal
@ 2015-09-30 4:54 ` David Miller
2015-10-01 14:39 ` Flavio Leitner
0 siblings, 1 reply; 6+ messages in thread
From: David Miller @ 2015-09-30 4:54 UTC (permalink / raw)
To: fw; +Cc: fbl, netdev
From: Florian Westphal <fw@strlen.de>
Date: Wed, 30 Sep 2015 02:45:07 +0200
> Flavio Leitner <fbl@redhat.com> wrote:
>> Remove __nf_conntrack_find() from headers.
>> Fixes: dcd93ed4cd1 ("netfilter: nf_conntrack: remove dead code"
>
> For the record: netfilter patches should go to
> netfilter-devel@vger.kernel.org .
>
> That being said, in this case I doubt Pablo minds if David takes this
> directly, patch ts obviously correct[tm] :)
I don't want to create any unnecessary merge hassles, so please
resubmit this properly to netfilter-devel, thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next] netfilter: remove dead code
2015-09-30 4:54 ` David Miller
@ 2015-10-01 14:39 ` Flavio Leitner
0 siblings, 0 replies; 6+ messages in thread
From: Flavio Leitner @ 2015-10-01 14:39 UTC (permalink / raw)
To: David Miller; +Cc: fw, netdev
On Tue, Sep 29, 2015 at 09:54:35PM -0700, David Miller wrote:
> From: Florian Westphal <fw@strlen.de>
> Date: Wed, 30 Sep 2015 02:45:07 +0200
>
> > Flavio Leitner <fbl@redhat.com> wrote:
> >> Remove __nf_conntrack_find() from headers.
> >> Fixes: dcd93ed4cd1 ("netfilter: nf_conntrack: remove dead code"
> >
> > For the record: netfilter patches should go to
> > netfilter-devel@vger.kernel.org .
> >
> > That being said, in this case I doubt Pablo minds if David takes this
> > directly, patch ts obviously correct[tm] :)
That's what I thought.
> I don't want to create any unnecessary merge hassles, so please
> resubmit this properly to netfilter-devel, thanks.
Ok, done.
http://marc.info/?l=netfilter-devel&m=144361945411969&w=2
Thanks,
fbl
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-10-01 14:39 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-30 0:25 [PATCH net-next] netfilter: remove dead code Flavio Leitner
2015-09-30 0:45 ` Florian Westphal
2015-09-30 4:54 ` David Miller
2015-10-01 14:39 ` Flavio Leitner
-- strict thread matches above, loose matches on Subject: below --
2013-12-31 1:16 Stephen Hemminger
2014-01-03 22:53 ` Pablo Neira Ayuso
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.