diff options
| author |   Don Dugger <donald.d.dugger@intel.com> | 2015-12-01 21:40:52 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-12-01 21:40:52 +0000 |
| commit | cc62f651747d5844cc12d33fb3620a7d05bae7dc (patch) | |
| tree | 1a6f2a536dfaa637f97e3848a01d701f83dfdfa1 /kernel/arch | |
| parent | 0484decb83ed4b458cea995a386c89741396cc88 (diff) | |
| parent | 3e1daf125f1df201014fdcfed08566376e9a432d (diff) | |
Merge "Add configuration to support OVS kernel module"
Diffstat (limited to 'kernel/arch')
| -rw-r--r-- | kernel/arch/x86/configs/opnfv.config | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/kernel/arch/x86/configs/opnfv.config b/kernel/arch/x86/configs/opnfv.config index 573bcc915..c73eaf29c 100644 --- a/kernel/arch/x86/configs/opnfv.config +++ b/kernel/arch/x86/configs/opnfv.config @@ -734,15 +734,15 @@ CONFIG_IP_PNP_BOOTP=y CONFIG_IP_PNP_RARP=y # CONFIG_NET_IPIP is not set # CONFIG_NET_IPGRE_DEMUX is not set -# CONFIG_NET_IP_TUNNEL is not set +CONFIG_NET_IP_TUNNEL=y CONFIG_IP_MROUTE=y # CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V2=y CONFIG_SYN_COOKIES=y -# CONFIG_NET_UDP_TUNNEL is not set +CONFIG_NET_UDP_TUNNEL=y # CONFIG_NET_FOU is not set -# CONFIG_GENEVE is not set +CONFIG_GENEVE=y # CONFIG_INET_AH is not set # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set @@ -972,11 +972,15 @@ CONFIG_NET_SCH_FIFO=y # CONFIG_DCB is not set CONFIG_DNS_RESOLVER=y # CONFIG_BATMAN_ADV is not set -# CONFIG_OPENVSWITCH is not set +CONFIG_OPENVSWITCH=m +CONFIG_OPENVSWITCH_VXLAN=m +CONFIG_OPENVSWITCH_GENEVE=m # CONFIG_VSOCKETS is not set # CONFIG_NETLINK_MMAP is not set # CONFIG_NETLINK_DIAG is not set -# CONFIG_MPLS is not set +CONFIG_MPLS=y +CONFIG_NET_MPLS_GSO=m +# CONFIG_MPLS_ROUTING is not set # CONFIG_HSR is not set # CONFIG_NET_SWITCHDEV is not set CONFIG_RPS=y @@ -1352,7 +1356,7 @@ CONFIG_NET_CORE=y # CONFIG_NET_TEAM is not set # CONFIG_MACVLAN is not set # CONFIG_IPVLAN is not set -# CONFIG_VXLAN is not set +CONFIG_VXLAN=y CONFIG_NETCONSOLE=y CONFIG_NETPOLL=y CONFIG_NET_POLL_CONTROLLER=y @@ -1448,9 +1452,11 @@ CONFIG_IGB=y CONFIG_IGBVF=y CONFIG_IXGB=y CONFIG_IXGBE=y +CONFIG_IXGBE_VXLAN=y # CONFIG_IXGBE_HWMON is not set -# CONFIG_IXGBEVF is not set +CONFIG_IXGBEVF=y CONFIG_I40E=y +CONFIG_I40E_VXLAN=y # CONFIG_I40EVF is not set # CONFIG_FM10K is not set CONFIG_NET_VENDOR_I825XX=y |