From: Florian Westphal <fw@strlen.de>
Date: Thu, 10 Nov 2016 13:17:01 +0000 (+0100)
Subject: netfilter: conntrack: remove unused netns_ct member
X-Git-Tag: v4.14-rc1~1973^2~281^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7e416ad7416307e22871a0ef0f0f14e2bb66a0d1;p=platform%2Fkernel%2Flinux-rpi3.git

netfilter: conntrack: remove unused netns_ct member

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>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---

diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
index e469e85..3d06d94 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