aboutsummaryrefslogtreecommitdiffstats
path: root/net/netfilter/nf_conntrack_labels.c
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2016-07-21 12:51:17 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2016-07-22 17:05:10 +0200
commit857ed310c013fe0d0059f955048dab589fa7a57a (patch)
tree8c91bf18eb14cb495c4b07137ba95df3d6695223 /net/netfilter/nf_conntrack_labels.c
parentnetfilter: conntrack: support a fixed size of 128 distinct labels (diff)
downloadlinux-dev-857ed310c013fe0d0059f955048dab589fa7a57a.tar.xz
linux-dev-857ed310c013fe0d0059f955048dab589fa7a57a.zip
netfilter: connlabels: move set helper to xt_connlabel
xt_connlabel is the only user so move it. Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter/nf_conntrack_labels.c')
-rw-r--r--net/netfilter/nf_conntrack_labels.c17
1 files changed, 0 insertions, 17 deletions
diff --git a/net/netfilter/nf_conntrack_labels.c b/net/netfilter/nf_conntrack_labels.c
index 7686200f9ace..bcab8bde7312 100644
--- 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)
- 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;