netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH nf-next] netfilter: conntrack: remove unused netns_ct member
@ 2016-11-10 13:17 Florian Westphal
  2016-11-13 21:22 ` Pablo Neira Ayuso
  0 siblings, 1 reply; 2+ messages in thread
From: Florian Westphal @ 2016-11-10 13:17 UTC (permalink / raw)
  To: netfilter-devel; +Cc: Florian Westphal

since 23014011ba420 ('netfilter: conntrack: support a fixed size of 128 distinct labels')
this isn't needed anymore.

Signed-off-by: Florian Westphal <fw@strlen.de>
---
 include/net/netns/conntrack.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
index e469e85de3f9..3d06d94d2e52 100644
--- a/include/net/netns/conntrack.h
+++ b/include/net/netns/conntrack.h
@@ -91,7 +91,6 @@ struct netns_ct {
 	struct nf_ip_net	nf_ct_proto;
 #if defined(CONFIG_NF_CONNTRACK_LABELS)
 	unsigned int		labels_used;
-	u8			label_words;
 #endif
 };
 #endif
-- 
2.7.3


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH nf-next] netfilter: conntrack: remove unused netns_ct member
  2016-11-10 13:17 [PATCH nf-next] netfilter: conntrack: remove unused netns_ct member Florian Westphal
@ 2016-11-13 21:22 ` Pablo Neira Ayuso
  0 siblings, 0 replies; 2+ messages in thread
From: Pablo Neira Ayuso @ 2016-11-13 21:22 UTC (permalink / raw)
  To: Florian Westphal; +Cc: netfilter-devel

On Thu, Nov 10, 2016 at 02:17:01PM +0100, Florian Westphal wrote:
> since 23014011ba420 ('netfilter: conntrack: support a fixed size of 128 distinct labels')
> this isn't needed anymore.

Applied, thanks.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-11-13 21:22 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-10 13:17 [PATCH nf-next] netfilter: conntrack: remove unused netns_ct member Florian Westphal
2016-11-13 21:22 ` Pablo Neira Ayuso

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).