Merge "Update kernel configuration to support contivpp"

diff --git a/misc/type1/macbin/defconfig-mcbin-edge b/misc/type1/macbin/defconfig-mcbin-edge
index f1a26d6..2d1646e 100644 (file)
--- a/misc/type1/macbin/defconfig-mcbin-edge
+++ b/misc/type1/macbin/defconfig-mcbin-edge
@@ -226,6 +226,8 @@ CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q_MVRP=y
 CONFIG_NET_SCHED=y
 CONFIG_NET_CLS_CGROUP=y
+CONFIG_VSOCKETS=y
+CONFIG_VIRTIO_VSOCKETS=y
 CONFIG_NETLINK_DIAG=y
 CONFIG_MPLS=y
 CONFIG_NET_MPLS_GSO=y
@@ -285,6 +287,7 @@ CONFIG_DUMMY=y
 CONFIG_MACVLAN=y
 CONFIG_MACVTAP=y
 CONFIG_IPVLAN=y
+CONFIG_IPVTAP=y
 CONFIG_VXLAN=y
 CONFIG_TUN=y
 CONFIG_VETH=y
@@ -548,6 +551,8 @@ CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=y
+CONFIG_VHOST_NET=y
+CONFIG_VHOST_VSOCK=y
 CONFIG_PRINTK_TIME=y
 CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_FS=y