tun: fix inability to set offloads after disabling them via ethtool

Added missing logic in tun driver, which prevents apps to set
offloads using tun ioctl, if offloads were previously disabled via ethtool

Signed-off-by: Yaroslav Isakov <yaroslav.isakov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Yaroslav Isakov 2017-03-16 22:44:10 +03:00 коммит произвёл David S. Miller
Родитель 7df9c24625
Коммит 09050957fa
1 изменённых файлов: 2 добавлений и 0 удалений

Просмотреть файл

@ -1931,6 +1931,8 @@ static int set_offload(struct tun_struct *tun, unsigned long arg)
return -EINVAL; return -EINVAL;
tun->set_features = features; tun->set_features = features;
tun->dev->wanted_features &= ~TUN_USER_FEATURES;
tun->dev->wanted_features |= features;
netdev_update_features(tun->dev); netdev_update_features(tun->dev);
return 0; return 0;