diff options
Diffstat (limited to 'drivers/net/tun.c')
| -rw-r--r-- | drivers/net/tun.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 8fe9cb7d0f72..26f8635b027d 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c | |||
| @@ -1686,7 +1686,9 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr) | |||
| 1686 | TUN_USER_FEATURES | NETIF_F_HW_VLAN_CTAG_TX | | 1686 | TUN_USER_FEATURES | NETIF_F_HW_VLAN_CTAG_TX | |
| 1687 | NETIF_F_HW_VLAN_STAG_TX; | 1687 | NETIF_F_HW_VLAN_STAG_TX; |
| 1688 | dev->features = dev->hw_features; | 1688 | dev->features = dev->hw_features; |
| 1689 | dev->vlan_features = dev->features; | 1689 | dev->vlan_features = dev->features & |
| 1690 | ~(NETIF_F_HW_VLAN_CTAG_TX | | ||
| 1691 | NETIF_F_HW_VLAN_STAG_TX); | ||
| 1690 | 1692 | ||
| 1691 | INIT_LIST_HEAD(&tun->disabled); | 1693 | INIT_LIST_HEAD(&tun->disabled); |
| 1692 | err = tun_attach(tun, file, false); | 1694 | err = tun_attach(tun, file, false); |