[Devel] [PATCH RH7] net: tun: don't loose NETIF_F_VIRTUAL device feature

[Pavel Tikhomirov]

else there would be no permission to use tun inside CT
https://jira.sw.ru/browse/PSBM-34066

Signed-off-by: Pavel Tikhomirov <ptikhomirov at virtuozzo.com>
---
 drivers/net/tun.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 9c57c11..d89daf6 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1701,7 +1701,7 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
 
 		dev->hw_features = NETIF_F_SG | NETIF_F_FRAGLIST |
 			TUN_USER_FEATURES;
-		dev->features = dev->hw_features;
+		dev->features |= dev->hw_features;
 		dev->vlan_features = dev->features;
 
 		INIT_LIST_HEAD(&tun->disabled);
-- 
1.9.3