diff options
| author | Joe Stringer | 2015-08-26 20:31:50 +0200 |
|---|---|---|
| committer | David S. Miller | 2015-08-27 20:40:43 +0200 |
| commit | 55e5713f2b5cefed98e3674017e994d688e47b85 (patch) | |
| tree | 3f1eed2ce014e45ed23b099243d580fa6070e651 /net/netfilter/nf_conntrack_labels.c | |
| parent | openvswitch: Allow matching on conntrack mark (diff) | |
| download | kernel-qcow2-linux-55e5713f2b5cefed98e3674017e994d688e47b85.tar.gz kernel-qcow2-linux-55e5713f2b5cefed98e3674017e994d688e47b85.tar.xz kernel-qcow2-linux-55e5713f2b5cefed98e3674017e994d688e47b85.zip | |
netfilter: Always export nf_connlabels_replace()
The following patches will reuse this code from OVS.
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
Acked-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nf_conntrack_labels.c')
| -rw-r--r-- | net/netfilter/nf_conntrack_labels.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/netfilter/nf_conntrack_labels.c b/net/netfilter/nf_conntrack_labels.c index bb53f120e79c..daa7c1383bec 100644 --- a/net/netfilter/nf_conntrack_labels.c +++ b/net/netfilter/nf_conntrack_labels.c @@ -48,7 +48,6 @@ int nf_connlabel_set(struct nf_conn *ct, u16 bit) } EXPORT_SYMBOL_GPL(nf_connlabel_set); -#if IS_ENABLED(CONFIG_NF_CT_NETLINK) static void replace_u32(u32 *address, u32 mask, u32 new) { u32 old, tmp; @@ -89,7 +88,6 @@ int nf_connlabels_replace(struct nf_conn *ct, return 0; } EXPORT_SYMBOL_GPL(nf_connlabels_replace); -#endif static struct nf_ct_ext_type labels_extend __read_mostly = { .len = sizeof(struct nf_conn_labels), |