Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1209552
| From | Joe Stringer <joestringer@nicira.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCHv4 net-next 07/10] netfilter: Always export nf_connlabels_replace() |
| Date | 2015-08-19 01:50 +0200 |
| Message-ID | <pYYNJ-5lR-29@gated-at.bofh.it> (permalink) |
| References | <pYYNI-5lR-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
The following patches will reuse this code from OVS.
Signed-off-by: Joe Stringer <joestringer@nicira.com>
---
v2-v4: No change.
---
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCHv4 net-next 00/10] OVS conntrack support Joe Stringer <joestringer@nicira.com> - 2015-08-19 01:50 +0200
[PATCHv4 net-next 02/10] openvswitch: Move MASKED* macros to datapath.h Joe Stringer <joestringer@nicira.com> - 2015-08-19 01:50 +0200
[PATCHv4 net-next 01/10] openvswitch: Serialize acts with original netlink len Joe Stringer <joestringer@nicira.com> - 2015-08-19 01:50 +0200
[PATCHv4 net-next 07/10] netfilter: Always export nf_connlabels_replace() Joe Stringer <joestringer@nicira.com> - 2015-08-19 01:50 +0200
Re: [PATCHv4 net-next 07/10] netfilter: Always export nf_connlabels_replace() Pravin Shelar <pshelar@nicira.com> - 2015-08-19 22:50 +0200
Re: [PATCHv4 net-next 07/10] netfilter: Always export nf_connlabels_replace() Thomas Graf <tgraf@suug.ch> - 2015-08-20 18:30 +0200
[PATCHv4 net-next 08/10] netfilter: connlabels: Export setting connlabel length Joe Stringer <joestringer@nicira.com> - 2015-08-19 01:50 +0200
Re: [PATCHv4 net-next 08/10] netfilter: connlabels: Export setting connlabel length Pravin Shelar <pshelar@nicira.com> - 2015-08-19 22:50 +0200
Re: [PATCHv4 net-next 08/10] netfilter: connlabels: Export setting connlabel length Thomas Graf <tgraf@suug.ch> - 2015-08-20 18:30 +0200
[PATCHv4 net-next 10/10] openvswitch: Allow attaching helpers to ct action Joe Stringer <joestringer@nicira.com> - 2015-08-19 01:50 +0200
Re: [PATCHv4 net-next 10/10] openvswitch: Allow attaching helpers to ct action Pravin Shelar <pshelar@nicira.com> - 2015-08-20 01:00 +0200
Re: [PATCHv4 net-next 10/10] openvswitch: Allow attaching helpers to ct action Joe Stringer <joestringer@nicira.com> - 2015-08-21 02:50 +0200
Re: [PATCHv4 net-next 10/10] openvswitch: Allow attaching helpers to ct action Pravin Shelar <pshelar@nicira.com> - 2015-08-21 19:50 +0200
Re: [PATCHv4 net-next 05/10] openvswitch: Add conntrack action Pravin Shelar <pshelar@nicira.com> - 2015-08-19 22:40 +0200
Re: [PATCHv4 net-next 05/10] openvswitch: Add conntrack action Thomas Graf <tgraf@suug.ch> - 2015-08-20 18:30 +0200
csiph-web