Merge tag 'fixes-for-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[karo-tx-linux.git] / drivers / net / tun.c

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 8fe9cb7d0f72e9fb7d34307f9a12797772844db1..ee328ba101e72a9e3f150d8c24068182be86abc5 100644 (file)
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -452,7 +452,7 @@ static void __tun_detach(struct tun_file *tfile, bool clean)
 
                --tun->numqueues;
                if (clean) {
-                       rcu_assign_pointer(tfile->tun, NULL);
+                       RCU_INIT_POINTER(tfile->tun, NULL);
                        sock_put(&tfile->sk);
                } else
                        tun_disable_queue(tun, tfile);
@@ -499,12 +499,12 @@ static void tun_detach_all(struct net_device *dev)
                tfile = rtnl_dereference(tun->tfiles[i]);
                BUG_ON(!tfile);
                wake_up_all(&tfile->wq.wait);
-               rcu_assign_pointer(tfile->tun, NULL);
+               RCU_INIT_POINTER(tfile->tun, NULL);
                --tun->numqueues;
        }
        list_for_each_entry(tfile, &tun->disabled, next) {
                wake_up_all(&tfile->wq.wait);
-               rcu_assign_pointer(tfile->tun, NULL);
+               RCU_INIT_POINTER(tfile->tun, NULL);
        }
        BUG_ON(tun->numqueues != 0);
 
@@ -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);
@@ -2192,7 +2194,7 @@ static int tun_chr_open(struct inode *inode, struct file * file)
                                            &tun_proto);
        if (!tfile)
                return -ENOMEM;
-       rcu_assign_pointer(tfile->tun, NULL);
+       RCU_INIT_POINTER(tfile->tun, NULL);
        tfile->net = get_net(current->nsproxy->net_ns);
        tfile->flags = 0;
        tfile->ifindex = 0;