netfilter: Always export nf_connlabels_replace()

joestringer · davem330 · commit 55e5713f2b5c · 2015-08-27T11:40:43.000-07:00
The following patches will reuse this code from OVS.

Signed-off-by: Joe Stringer &lt;joestringer@nicira.com&gt;
Acked-by: Pravin B Shelar &lt;pshelar@nicira.com&gt;
Acked-by: Thomas Graf &lt;tgraf@suug.ch&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git 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),

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,6 @@ int nf_connlabel_set(struct nf_conn *ct, u16 bit)`
`48`	`48`	`}`
`49`	`49`	`EXPORT_SYMBOL_GPL(nf_connlabel_set);`
`50`	`50`
`51`		`-#if IS_ENABLED(CONFIG_NF_CT_NETLINK)`
`52`	`51`	`static void replace_u32(u32 *address, u32 mask, u32 new)`
`53`	`52`	`{`
`54`	`53`	`u32 old, tmp;`
`@@ -89,7 +88,6 @@ int nf_connlabels_replace(struct nf_conn *ct,`
`89`	`88`	`return 0;`
`90`	`89`	`}`
`91`	`90`	`EXPORT_SYMBOL_GPL(nf_connlabels_replace);`
`92`		`-#endif`
`93`	`91`
`94`	`92`	`static struct nf_ct_ext_type labels_extend __read_mostly = {`
`95`	`93`	`.len = sizeof(struct nf_conn_labels),`