diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-03-11 11:34:27 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-03-11 11:34:27 +0100 |
| commit | a02ed5e3e05ec5e8af21e645cccc77f3a6480aaf (patch) | |
| tree | 95a0df31b0c9b1e0357b8dd378e2eab637970df4 /drivers/net/tun.c | |
| parent | trace: Replace hardcoding of 19 with MAX_NICE (diff) | |
| parent | sched/clock: Prevent tracing recursion in sched_clock_cpu() (diff) | |
| download | linux-a02ed5e3e05ec5e8af21e645cccc77f3a6480aaf.tar.xz linux-a02ed5e3e05ec5e8af21e645cccc77f3a6480aaf.zip | |
Merge branch 'sched/urgent' into sched/core
Pick up fixes before queueing up new changes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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) TUN_USER_FEATURES | NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_STAG_TX; dev->features = dev->hw_features; - dev->vlan_features = dev->features; + dev->vlan_features = dev->features & + ~(NETIF_F_HW_VLAN_CTAG_TX | + NETIF_F_HW_VLAN_STAG_TX); INIT_LIST_HEAD(&tun->disabled); err = tun_attach(tun, file, false); |