[PATCHv5 net-next 07/10] netfilter: Always export nf_connlabels_replace()
flat view
STALE4082d
SUPERSEDED: 2 (1M)
From: Joe Stringer <hidden>
Date: 2015-08-25 00:32:42
Also in:
lkml, netfilter-devel
Subsystem:
netfilter, networking [general], the rest · Maintainers:
Pablo Neira Ayuso, Florian Westphal, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Status: Superseded by v6 (posted 2015-08-26). [go to v6]
Revision v5 (6 revisions archived); 2 review trailers.
Revisions (6)
The following patches will reuse this code from OVS. Signed-off-by: Joe Stringer <redacted> Acked-by: Pravin B Shelar <redacted> Acked-by: Thomas Graf <tgraf@suug.ch> --- v2-v4: No change. v5: Add acks. --- net/netfilter/nf_conntrack_labels.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/net/netfilter/nf_conntrack_labels.c b/net/netfilter/nf_conntrack_labels.c
index bb53f12..daa7c13 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),
--
2.1.4