Merge branch 'for-viro' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...

[cascardo/linux.git] / net / netfilter / nf_conntrack_labels.c

diff --git a/net/netfilter/nf_conntrack_labels.c b/net/netfilter/nf_conntrack_labels.c
index 252e6a7..bcab8bd 100644 (file)
--- a/net/netfilter/nf_conntrack_labels.c
+++ b/net/netfilter/nf_conntrack_labels.c
@@ -16,23 +16,6 @@
 
 static spinlock_t nf_connlabels_lock;
 
-int nf_connlabel_set(struct nf_conn *ct, u16 bit)
-{
-       struct nf_conn_labels *labels = nf_ct_labels_find(ct);
-
-       if (!labels || BIT_WORD(bit) >= labels->words)
-               return -ENOSPC;
-
-       if (test_bit(bit, labels->bits))
-               return 0;
-
-       if (!test_and_set_bit(bit, labels->bits))
-               nf_conntrack_event_cache(IPCT_LABEL, ct);
-
-       return 0;
-}
-EXPORT_SYMBOL_GPL(nf_connlabel_set);
-
 static int replace_u32(u32 *address, u32 mask, u32 new)
 {
        u32 old, tmp;
@@ -60,7 +43,7 @@ int nf_connlabels_replace(struct nf_conn *ct,
        if (!labels)
                return -ENOSPC;
 
-       size = labels->words * sizeof(long);
+       size = sizeof(labels->bits);
        if (size < (words32 * sizeof(u32)))
                words32 = size / sizeof(u32);
 
@@ -80,16 +63,11 @@ EXPORT_SYMBOL_GPL(nf_connlabels_replace);
 
 int nf_connlabels_get(struct net *net, unsigned int bits)
 {
-       size_t words;
-
-       words = BIT_WORD(bits) + 1;
-       if (words > NF_CT_LABELS_MAX_SIZE / sizeof(long))
+       if (BIT_WORD(bits) >= NF_CT_LABELS_MAX_SIZE / sizeof(long))
                return -ERANGE;
 
        spin_lock(&nf_connlabels_lock);
        net->ct.labels_used++;
-       if (words > net->ct.label_words)
-               net->ct.label_words = words;
        spin_unlock(&nf_connlabels_lock);
 
        return 0;
@@ -100,8 +78,6 @@ void nf_connlabels_put(struct net *net)
 {
        spin_lock(&nf_connlabels_lock);
        net->ct.labels_used--;
-       if (net->ct.labels_used == 0)
-               net->ct.label_words = 0;
        spin_unlock(&nf_connlabels_lock);
 }
 EXPORT_SYMBOL_GPL(nf_connlabels_put);