| Message ID | 1443572700-29705-1-git-send-email-fbl@redhat.com |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
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] :) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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);
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(-)