From: Joe Stringer <joestringer@nicira.com>
To: netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, pablo@netfilter.org,
kaber@trash.net, jpettit@nicira.com, pshelar@nicira.com,
azhou@nicira.com, jesse@nicira.com, fwestpha@redhat.com,
hannes@redhat.com, tgraf@noironetworks.com
Subject: [PATCHv2 net-next 7/9] netfilter: Always export nf_connlabels_replace()
Date: Tue, 4 Aug 2015 21:49:57 -0700 [thread overview]
Message-ID: <1438750199-9061-8-git-send-email-joestringer@nicira.com> (raw)
In-Reply-To: <1438750199-9061-1-git-send-email-joestringer@nicira.com>
The following patches will reuse this code from OVS.
Signed-off-by: Joe Stringer <joestringer@nicira.com>
---
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
next prev parent reply other threads:[~2015-08-05 4:51 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-05 4:49 [PATCHv2 net-next 0/9] OVS conntrack support Joe Stringer
2015-08-05 4:49 ` [PATCHv2 net-next 1/9] openvswitch: Serialize acts with original netlink len Joe Stringer
2015-08-05 22:30 ` Pravin Shelar
2015-08-05 4:49 ` [PATCHv2 net-next 2/9] openvswitch: Move MASKED* macros to datapath.h Joe Stringer
2015-08-05 22:30 ` Pravin Shelar
2015-08-05 4:49 ` [PATCHv2 net-next 3/9] ipv6: Export nf_ct_frag6_gather() Joe Stringer
2015-08-05 22:30 ` Pravin Shelar
2015-08-05 4:49 ` [PATCHv2 net-next 4/9] netfilter: connlabels: Export setting connlabel length Joe Stringer
2015-08-05 9:01 ` Florian Westphal
2015-08-05 4:49 ` [PATCHv2 net-next 5/9] openvswitch: Add conntrack action Joe Stringer
2015-08-05 22:31 ` Pravin Shelar
2015-08-06 18:07 ` Joe Stringer
2015-08-06 21:36 ` Pravin Shelar
2015-08-10 20:36 ` Joe Stringer
2015-08-05 4:49 ` [PATCHv2 net-next 6/9] openvswitch: Allow matching on conntrack mark Joe Stringer
2015-08-05 4:49 ` Joe Stringer [this message]
2015-08-05 4:49 ` [PATCHv2 net-next 8/9] openvswitch: Allow matching on conntrack label Joe Stringer
2015-08-05 4:49 ` [PATCHv2 net-next 9/9] openvswitch: Allow attaching helpers to ct action Joe Stringer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1438750199-9061-8-git-send-email-joestringer@nicira.com \
--to=joestringer@nicira.com \
--cc=azhou@nicira.com \
--cc=fwestpha@redhat.com \
--cc=hannes@redhat.com \
--cc=jesse@nicira.com \
--cc=jpettit@nicira.com \
--cc=kaber@trash.net \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pablo@netfilter.org \
--cc=pshelar@nicira.com \
--cc=tgraf@noironetworks.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®