]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
netfilter: conntrack: remove unused netns_ct member
authorFlorian Westphal <fw@strlen.de>
Thu, 10 Nov 2016 13:17:01 +0000 (14:17 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Sun, 13 Nov 2016 21:21:16 +0000 (22:21 +0100)
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>
include/net/netns/conntrack.h

index e469e85de3f9cad8c3b3573c6c5846d7c6303106..3d06d94d2e528cb856032f77c5216aa31e077f05 100644 (file)
@@ -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