Commit f88f69dd authored by Joe Stringer's avatar Joe Stringer Committed by David S. Miller
Browse files

openvswitch: Remove conntrack Kconfig option. 



There's no particular desire to have conntrack action support in Open
vSwitch as an independently configurable bit, rather just to ensure
there is not a hard dependency. This exposed option doesn't accurately
reflect the conntrack dependency when enabled, so simplify this by
removing the option. Compile the support if NF_CONNTRACK is enabled.

Fixes: 7f8a436e ("openvswitch: Add conntrack action")
Signed-off-by: default avatarJoe Stringer <joestringer@nicira.com>
Acked-by: default avatarPravin B Shelar <pshelar@nicira.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 585e7e1a

net/openvswitch/Kconfig

+1 −11
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
config OPENVSWITCH

	tristate "Open vSwitch"

	depends on INET

	depends on (!NF_CONNTRACK || NF_CONNTRACK)

	select LIBCRC32C

	select MPLS

	select NET_MPLS_GSO
@@ -31,17 +32,6 @@ config OPENVSWITCH 


	  If unsure, say N.



config OPENVSWITCH_CONNTRACK

	bool "Open vSwitch conntrack action support"

	depends on OPENVSWITCH

	depends on NF_CONNTRACK

	default OPENVSWITCH

	---help---

	  If you say Y here, then Open vSwitch module will be able to pass

	  packets through conntrack.



	  Say N to exclude this support and reduce the binary size.



config OPENVSWITCH_GRE

	tristate "Open vSwitch GRE tunneling support"

	depends on OPENVSWITCH

net/openvswitch/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -15,7 +15,9 @@ openvswitch-y := \ 
	vport-internal_dev.o \

	vport-netdev.o



openvswitch-$(CONFIG_OPENVSWITCH_CONNTRACK) += conntrack.o

ifneq ($(CONFIG_NF_CONNTRACK),)

openvswitch-y += conntrack.o

endif



obj-$(CONFIG_OPENVSWITCH_VXLAN)+= vport-vxlan.o

obj-$(CONFIG_OPENVSWITCH_GENEVE)+= vport-geneve.o

net/openvswitch/conntrack.h

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
struct ovs_conntrack_info;

enum ovs_key_attr;



#if defined(CONFIG_OPENVSWITCH_CONNTRACK)

#if IS_ENABLED(CONFIG_NF_CONNTRACK)

void ovs_ct_init(struct net *);

void ovs_ct_exit(struct net *);

bool ovs_ct_verify(struct net *, enum ovs_key_attr attr);
@@ -82,5 +82,5 @@ static inline int ovs_ct_put_key(const struct sw_flow_key *key, 
}



static inline void ovs_ct_free_action(const struct nlattr *a) { }

#endif

#endif /* CONFIG_NF_CONNTRACK */

#endif /* ovs_conntrack.h */

CRA Git | Maintained and supported by SUSTech CRA and CCSE