projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
182e304
)
netfilter: Always export nf_connlabels_replace()
author
Joe Stringer
<
[email protected]
>
Wed, 26 Aug 2015 18:31:50 +0000
(11:31 -0700)
committer
David S. Miller
<
[email protected]
>
Thu, 27 Aug 2015 18:40:43 +0000
(11:40 -0700)
The following patches will reuse this code from OVS.
Signed-off-by: Joe Stringer <
[email protected]
>
Acked-by: Pravin B Shelar <
[email protected]
>
Acked-by: Thomas Graf <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
net/netfilter/nf_conntrack_labels.c
patch
|
blob
|
history
diff --git
a/net/netfilter/nf_conntrack_labels.c
b/net/netfilter/nf_conntrack_labels.c
index bb53f120e79cb3547b1f23eba8e3d26c91aa43a4..daa7c1383becc499e3170d5c72f1c86f232becf9 100644
(file)
--- 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),