[PATCHv2 net-next 7/9] netfilter: Always export nf_connlabels_replace()
flat view
STALE4097d
SUPERSEDED
From: Joe Stringer <hidden>
Date: 2015-08-05 04:51:06
Also in:
lkml
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 v2 (6 revisions archived).
Revisions (6)
- v2 current re-posted current
- v1 [diff against previous]
- v3 [diff against previous]
- v4 [diff against previous]
- v5 [diff against previous]
- v6 [diff against previous]
The following patches will reuse this code from OVS. Signed-off-by: Joe Stringer <redacted> --- 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 06e71a0..3ce5c31 100644
--- a/net/netfilter/nf_conntrack_labels.c
+++ b/net/netfilter/nf_conntrack_labels.c@@ -50,7 +50,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;
@@ -91,7 +90,6 @@ int nf_connlabels_replace(struct nf_conn *ct, return 0; } EXPORT_SYMBOL_GPL(nf_connlabels_replace); -#endif int nf_connlabels_get(struct net *net, unsigned int n_bits) {
--
2.1.4