Commit 89f56d1e authored by Michael S. Tsirkin's avatar Michael S. Tsirkin Committed by David S. Miller
Browse files

tun: reuse struct sock fields 



As tun always has an embeedded struct sock,
use sk and sk_receive_queue fields instead of
duplicating them in tun_struct.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 86393e52

drivers/net/tun.c

+12 −18
Original line number Original line Diff line number Diff line
@@ -103,13 +103,10 @@ struct tun_struct { 
	uid_t			owner;

	uid_t			owner;

	gid_t			group;

	gid_t			group;





	struct sk_buff_head	readq;



	struct net_device	*dev;

	struct net_device	*dev;

	struct fasync_struct	*fasync;

	struct fasync_struct	*fasync;





	struct tap_filter       txflt;

	struct tap_filter       txflt;

	struct sock		*sk;

	struct socket		socket;

	struct socket		socket;





#ifdef TUN_DEBUG

#ifdef TUN_DEBUG
@@ -155,7 +152,7 @@ static int tun_attach(struct tun_struct *tun, struct file *file) 
	tfile->tun = tun;

	tfile->tun = tun;

	tun->tfile = tfile;

	tun->tfile = tfile;

	dev_hold(tun->dev);

	dev_hold(tun->dev);

	sock_hold(tun->sk);

	sock_hold(tun->socket.sk);

	atomic_inc(&tfile->count);

	atomic_inc(&tfile->count);





out:

out:
@@ -171,7 +168,7 @@ static void __tun_detach(struct tun_struct *tun) 
	netif_tx_unlock_bh(tun->dev);

	netif_tx_unlock_bh(tun->dev);





	/* Drop read queue */

	/* Drop read queue */

	skb_queue_purge(&tun->readq);

	skb_queue_purge(&tun->socket.sk->sk_receive_queue);





	/* Drop the extra count on the net device */

	/* Drop the extra count on the net device */

	dev_put(tun->dev);

	dev_put(tun->dev);
@@ -340,7 +337,7 @@ static void tun_free_netdev(struct net_device *dev) 
{

{

	struct tun_struct *tun = netdev_priv(dev);

	struct tun_struct *tun = netdev_priv(dev);





	sock_put(tun->sk);

	sock_put(tun->socket.sk);

}

}





/* Net device open. */

/* Net device open. */
@@ -374,7 +371,7 @@ static netdev_tx_t tun_net_xmit(struct sk_buff *skb, struct net_device *dev) 
	if (!check_filter(&tun->txflt, skb))

	if (!check_filter(&tun->txflt, skb))

		goto drop;

		goto drop;





	if (skb_queue_len(&tun->readq) >= dev->tx_queue_len) {

	if (skb_queue_len(&tun->socket.sk->sk_receive_queue) >= dev->tx_queue_len) {

		if (!(tun->flags & TUN_ONE_QUEUE)) {

		if (!(tun->flags & TUN_ONE_QUEUE)) {

			/* Normal queueing mode. */

			/* Normal queueing mode. */

			/* Packet scheduler handles dropping of further packets. */

			/* Packet scheduler handles dropping of further packets. */
@@ -391,7 +388,7 @@ static netdev_tx_t tun_net_xmit(struct sk_buff *skb, struct net_device *dev) 
	}

	}





	/* Enqueue packet */

	/* Enqueue packet */

	skb_queue_tail(&tun->readq, skb);

	skb_queue_tail(&tun->socket.sk->sk_receive_queue, skb);

	dev->trans_start = jiffies;

	dev->trans_start = jiffies;





	/* Notify and wake up reader process */

	/* Notify and wake up reader process */
@@ -492,13 +489,13 @@ static unsigned int tun_chr_poll(struct file *file, poll_table * wait) 
	if (!tun)

	if (!tun)

		return POLLERR;

		return POLLERR;





	sk = tun->sk;

	sk = tun->socket.sk;





	DBG(KERN_INFO "%s: tun_chr_poll\n", tun->dev->name);

	DBG(KERN_INFO "%s: tun_chr_poll\n", tun->dev->name);





	poll_wait(file, &tun->socket.wait, wait);

	poll_wait(file, &tun->socket.wait, wait);





	if (!skb_queue_empty(&tun->readq))

	if (!skb_queue_empty(&sk->sk_receive_queue))

		mask |= POLLIN | POLLRDNORM;

		mask |= POLLIN | POLLRDNORM;





	if (sock_writeable(sk) ||

	if (sock_writeable(sk) ||
@@ -519,7 +516,7 @@ static inline struct sk_buff *tun_alloc_skb(struct tun_struct *tun, 
					    size_t prepad, size_t len,

					    size_t prepad, size_t len,

					    size_t linear, int noblock)

					    size_t linear, int noblock)

{

{

	struct sock *sk = tun->sk;

	struct sock *sk = tun->socket.sk;

	struct sk_buff *skb;

	struct sk_buff *skb;

	int err;

	int err;
@@ -787,7 +784,7 @@ static ssize_t tun_chr_aio_read(struct kiocb *iocb, const struct iovec *iv, 
		current->state = TASK_INTERRUPTIBLE;

		current->state = TASK_INTERRUPTIBLE;





		/* Read frames from the queue */

		/* Read frames from the queue */

		if (!(skb=skb_dequeue(&tun->readq))) {

		if (!(skb=skb_dequeue(&tun->socket.sk->sk_receive_queue))) {

			if (file->f_flags & O_NONBLOCK) {

			if (file->f_flags & O_NONBLOCK) {

				ret = -EAGAIN;

				ret = -EAGAIN;

				break;

				break;
@@ -824,8 +821,6 @@ static void tun_setup(struct net_device *dev) 
{

{

	struct tun_struct *tun = netdev_priv(dev);

	struct tun_struct *tun = netdev_priv(dev);





	skb_queue_head_init(&tun->readq);



	tun->owner = -1;

	tun->owner = -1;

	tun->group = -1;

	tun->group = -1;
@@ -991,7 +986,6 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr) 
		sk->sk_write_space = tun_sock_write_space;

		sk->sk_write_space = tun_sock_write_space;

		sk->sk_sndbuf = INT_MAX;

		sk->sk_sndbuf = INT_MAX;





		tun->sk = sk;

		container_of(sk, struct tun_sock, sk)->tun = tun;

		container_of(sk, struct tun_sock, sk)->tun = tun;





		tun_net_init(dev);

		tun_net_init(dev);
@@ -1249,7 +1243,7 @@ static long tun_chr_ioctl(struct file *file, unsigned int cmd, 
		break;

		break;





	case TUNGETSNDBUF:

	case TUNGETSNDBUF:

		sndbuf = tun->sk->sk_sndbuf;

		sndbuf = tun->socket.sk->sk_sndbuf;

		if (copy_to_user(argp, &sndbuf, sizeof(sndbuf)))

		if (copy_to_user(argp, &sndbuf, sizeof(sndbuf)))

			ret = -EFAULT;

			ret = -EFAULT;

		break;

		break;
@@ -1260,7 +1254,7 @@ static long tun_chr_ioctl(struct file *file, unsigned int cmd, 
			break;

			break;

		}

		}





		tun->sk->sk_sndbuf = sndbuf;

		tun->socket.sk->sk_sndbuf = sndbuf;

		break;

		break;





	default:

	default:
@@ -1343,7 +1337,7 @@ static int tun_chr_close(struct inode *inode, struct file *file) 




	tun = tfile->tun;

	tun = tfile->tun;

	if (tun)

	if (tun)

		sock_put(tun->sk);

		sock_put(tun->socket.sk);





	put_net(tfile->net);

	put_net(tfile->net);

	kfree(tfile);

	kfree(tfile);