Skip to content

Commit

Permalink
tun: use tun_sk instead container_of
Browse files Browse the repository at this point in the history
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Vitaliy Gusev authored and David S. Miller committed Dec 27, 2009
1 parent 08fafd8 commit 80924e5
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/net/tun.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down Expand Up @@ -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);

Expand Down

0 comments on commit 80924e5

Please sign in to comment.