diff options
| author | Joe Stringer <joestringer@nicira.com> | 2015-09-12 01:01:16 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-09-12 01:39:04 +0300 |
| commit | 38c089d1d8d058f5dff018a811568aa8e8bc47fc (patch) | |
| tree | c76ac8d4750650a0c5e9c07f1a953269d8e4036d /net/openvswitch | |
| parent | c2d4fbd2163e607915cc05798ce7fb7f31117cc1 (diff) | |
| download | linux-38c089d1d8d058f5dff018a811568aa8e8bc47fc.tar.xz | |
openvswitch: Fix dependency on IPv6 defrag.
When NF_CONNTRACK is built-in, NF_DEFRAG_IPV6 is a module, and
OPENVSWITCH is built-in, the following build error would occur:
net/built-in.o: In function `ovs_ct_execute':
(.text+0x10f587): undefined reference to `nf_ct_frag6_gather'
Fixes: 7f8a436eaa2c ("openvswitch: Add conntrack action")
Reported-by: Jim Davis <jim.epost@gmail.com>
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch')
| -rw-r--r-- | net/openvswitch/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/openvswitch/Kconfig b/net/openvswitch/Kconfig index 2a071f470d57..d143aa9f6654 100644 --- a/net/openvswitch/Kconfig +++ b/net/openvswitch/Kconfig @@ -5,7 +5,8 @@ config OPENVSWITCH tristate "Open vSwitch" depends on INET - depends on (!NF_CONNTRACK || NF_CONNTRACK) + depends on !NF_CONNTRACK || \ + (NF_CONNTRACK && (!NF_DEFRAG_IPV6 || NF_DEFRAG_IPV6)) select LIBCRC32C select MPLS select NET_MPLS_GSO |