Messages in this thread Patch in this message | ![/](/images/icornerl.gif) | | From | Joe Stringer <> | Subject | [PATCHv5 net-next 07/10] netfilter: Always export nf_connlabels_replace() | Date | Mon, 24 Aug 2015 17:32:17 -0700 |
| |
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> --- 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
| ![\](/images/icornerr.gif) |