[RHEL7,COMMIT] openvswitch: allow to create ovs bridges inside Containers

Submitted by Konstantin Khorenko on Feb. 28, 2020, 10:05 a.m.

Details

Message ID 202002281005.01SA5Sct029872@finist-ce7.sw.ru
State New
Series "enable running Kubernetes inside a Container"
Headers show

Commit Message

Konstantin Khorenko Feb. 28, 2020, 10:05 a.m.
The commit is pushed to "branch-rh7-3.10.0-1062.12.1.vz7.131.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-1062.12.1.vz7.131.5
------>
commit bcba21779fefb613acf03ec1e5c5f3efe9661b11
Author: Konstantin Khorenko <khorenko@virtuozzo.com>
Date:   Fri Feb 28 13:05:28 2020 +0300

    openvswitch: allow to create ovs bridges inside Containers
    
    openvswitch briges are used by Weave net plugin for Kubernetes.
    
    https://jira.sw.ru/browse/PSBM-92107
    
    Signed-off-by: Konstantin Khorenko <khorenko@virtuozzo.com>
---
 net/openvswitch/vport-internal_dev.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/net/openvswitch/vport-internal_dev.c b/net/openvswitch/vport-internal_dev.c
index d9f062a49be8a..e723cf5e3aa8b 100644
--- a/net/openvswitch/vport-internal_dev.c
+++ b/net/openvswitch/vport-internal_dev.c
@@ -157,7 +157,8 @@  static void do_setup(struct net_device *netdev)
 
 	netdev->features = NETIF_F_LLTX | NETIF_F_SG | NETIF_F_FRAGLIST |
 			   NETIF_F_HIGHDMA | NETIF_F_HW_CSUM |
-			   NETIF_F_GSO_SOFTWARE | NETIF_F_GSO_ENCAP_ALL;
+			   NETIF_F_GSO_SOFTWARE | NETIF_F_GSO_ENCAP_ALL |
+			   NETIF_F_VIRTUAL;
 
 	netdev->vlan_features = netdev->features;
 	netdev->hw_enc_features = netdev->features;