Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1200404

[PATCHv2 net-next 7/9] netfilter: Always export nf_connlabels_replace()

Show all headers | View raw

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

--
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

Thread

[PATCHv2 net-next 0/9] OVS conntrack support Joe Stringer <joestringer@nicira.com> - 2015-08-05 07:00 +0200
  [PATCHv2 net-next 8/9] openvswitch: Allow matching on conntrack label Joe Stringer <joestringer@nicira.com> - 2015-08-05 07:00 +0200
  [PATCHv2 net-next 7/9] netfilter: Always export nf_connlabels_replace() Joe Stringer <joestringer@nicira.com> - 2015-08-05 07:00 +0200
  [PATCHv2 net-next 5/9] openvswitch: Add conntrack action Joe Stringer <joestringer@nicira.com> - 2015-08-05 07:00 +0200
    Re: [PATCHv2 net-next 5/9] openvswitch: Add conntrack action Pravin Shelar <pshelar@nicira.com> - 2015-08-06 00:40 +0200
      Re: [PATCHv2 net-next 5/9] openvswitch: Add conntrack action Joe Stringer <joestringer@nicira.com> - 2015-08-06 20:10 +0200
        Re: [PATCHv2 net-next 5/9] openvswitch: Add conntrack action Pravin Shelar <pshelar@nicira.com> - 2015-08-06 23:40 +0200
          Re: [PATCHv2 net-next 5/9] openvswitch: Add conntrack action Joe Stringer <joestringer@nicira.com> - 2015-08-10 22:40 +0200
  [PATCHv2 net-next 6/9] openvswitch: Allow matching on conntrack mark Joe Stringer <joestringer@nicira.com> - 2015-08-05 07:00 +0200
  [PATCHv2 net-next 9/9] openvswitch: Allow attaching helpers to ct action Joe Stringer <joestringer@nicira.com> - 2015-08-05 07:00 +0200
  [PATCHv2 net-next 2/9] openvswitch: Move MASKED* macros to datapath.h Joe Stringer <joestringer@nicira.com> - 2015-08-05 07:00 +0200
    Re: [PATCHv2 net-next 2/9] openvswitch: Move MASKED* macros to datapath.h Pravin Shelar <pshelar@nicira.com> - 2015-08-06 00:40 +0200

csiph-web