The commit is pushed to "branch-rh7-3.10.0-123.1.2-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git after rh7-3.10.0-123.1.2.vz7.5.12 ------> commit 41b5319e8d1f66cb250f012b39c619f946bddc67 Author: Kirill Tkhai <ktk...@odin.com> Date: Wed Jun 10 19:08:35 2015 +0400
ve/ip_gre: containerize per-net devices Port patch diff-ve-net-ip_gre-containerize-per-net-devices from 2.6.32: This patch adds IP GRE devices support in a container. Done in the scope of https://jira.sw.ru/browse/PSBM-24331 Signed-off-by: Stanislav Kinsbursky <skinsbur...@parallels.com> Signed-off-by: Kirill Tkhai <ktk...@odin.com> --- net/ipv4/ip_gre.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index 8d6939e..b009e2e 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -463,6 +463,7 @@ static void ipgre_tunnel_setup(struct net_device *dev) { dev->netdev_ops = &ipgre_netdev_ops; ip_tunnel_setup(dev, ipgre_net_id); + dev->features |= NETIF_F_VIRTUAL; } static void __gre_tunnel_init(struct net_device *dev) @@ -649,6 +650,7 @@ static void ipgre_tap_setup(struct net_device *dev) ether_setup(dev); dev->netdev_ops = &gre_tap_netdev_ops; ip_tunnel_setup(dev, gre_tap_net_id); + dev->features |= NETIF_F_VIRTUAL; } static int ipgre_newlink(struct net *src_net, struct net_device *dev, _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel