1 files changed, 7 insertions, 5 deletions

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index afdf950617c3..2c9e45f50edb 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -622,7 +622,8 @@ static int tun_attach(struct tun_struct *tun, struct file *file, bool skip_filte
 
         /* Re-attach the filter to persist device */
         if (!skip_filter && (tun->filter_attached == true)) {
-                err = sk_attach_filter(&tun->fprog, tfile->socket.sk);
+                err = __sk_attach_filter(&tun->fprog, tfile->socket.sk,
+                                         lockdep_rtnl_is_held());
                 if (!err)
                         goto out;
         }
@@ -1014,7 +1015,6 @@ static void tun_net_init(struct net_device *dev)
                 /* Zero header length */
                 dev->type = ARPHRD_NONE;
                 dev->flags = IFF_POINTOPOINT | IFF_NOARP | IFF_MULTICAST;
-                dev->tx_queue_len = TUN_READQ_SIZE;  /* We prefer our own queue length */
                 break;
 
         case IFF_TAP:
@@ -1026,7 +1026,6 @@ static void tun_net_init(struct net_device *dev)
 
                 eth_hw_addr_random(dev);
 
-                dev->tx_queue_len = TUN_READQ_SIZE;  /* We prefer our own queue length */
                 break;
         }
 }
@@ -1480,6 +1479,8 @@ static void tun_setup(struct net_device *dev)
 
         dev->ethtool_ops = &tun_ethtool_ops;
         dev->destructor = tun_free_netdev;
+        /* We prefer our own queue length */
+        dev->tx_queue_len = TUN_READQ_SIZE;
 }
 
 /* Trivial set of netlink ops to allow deleting tun or tap
@@ -1822,7 +1823,7 @@ static void tun_detach_filter(struct tun_struct *tun, int n)
 
         for (i = 0; i < n; i++) {
                 tfile = rtnl_dereference(tun->tfiles[i]);
-                sk_detach_filter(tfile->socket.sk);
+                __sk_detach_filter(tfile->socket.sk, lockdep_rtnl_is_held());
         }
 
         tun->filter_attached = false;
@@ -1835,7 +1836,8 @@ static int tun_attach_filter(struct tun_struct *tun)
 
         for (i = 0; i < tun->numqueues; i++) {
                 tfile = rtnl_dereference(tun->tfiles[i]);
-                ret = sk_attach_filter(&tun->fprog, tfile->socket.sk);
+                ret = __sk_attach_filter(&tun->fprog, tfile->socket.sk,
+                                         lockdep_rtnl_is_held());
                 if (ret) {
                         tun_detach_filter(tun, i);
                         return ret;