Patchwork tun: use tun_sk instead container_of

login
register
mail settings
Submitter Vitaliy Gusev
Date Dec. 25, 2009, 5:17 p.m.
Message ID <200912252017.43998.vgusev@openvz.org>
Download mbox | patch
Permalink /patch/41799/
State Accepted
Delegated to: David Miller
Headers show

Comments

Vitaliy Gusev - Dec. 25, 2009, 5:17 p.m.
Using macro tun_sk is more clear and shorter. However tun.c has tun_sk,
but doesn't use it. 

Signed-off-by: Vitaliy Gusev <vgusev@openvz.org>

---
 drivers/net/tun.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - Dec. 27, 2009, 4:26 a.m.
From: Vitaliy Gusev <vgusev@openvz.org>
Date: Fri, 25 Dec 2009 20:17:43 +0300

> Using macro tun_sk is more clear and shorter. However tun.c has tun_sk,
> but doesn't use it. 
> 
> Signed-off-by: Vitaliy Gusev <vgusev@openvz.org>

Applied, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 01e99f2..2834a01 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -849,13 +849,13 @@  static void tun_sock_write_space(struct sock *sk)
 	if (sk->sk_sleep && waitqueue_active(sk->sk_sleep))
 		wake_up_interruptible_sync(sk->sk_sleep);
 
-	tun = container_of(sk, struct tun_sock, sk)->tun;
+	tun = tun_sk(sk)->tun;
 	kill_fasync(&tun->fasync, SIGIO, POLL_OUT);
 }
 
 static void tun_sock_destruct(struct sock *sk)
 {
-	free_netdev(container_of(sk, struct tun_sock, sk)->tun->dev);
+	free_netdev(tun_sk(sk)->tun->dev);
 }
 
 static struct proto tun_proto = {
@@ -990,7 +990,7 @@  static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
 		sk->sk_write_space = tun_sock_write_space;
 		sk->sk_sndbuf = INT_MAX;
 
-		container_of(sk, struct tun_sock, sk)->tun = tun;
+		tun_sk(sk)->tun = tun;
 
 		security_tun_dev_post_create(sk);