Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81e2a3d5 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

atm: sk_wmem_alloc initial value is one 



commit 2b85a34e
(net: No more expensive sock_hold()/sock_put() on each tx)
changed initial sk_wmem_alloc value.

This broke net/atm since this protocol assumed a null
initial value. This patch makes necessary changes.

Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 31e6d363

net/atm/common.c

+6 −6
Original line number Diff line number Diff line
@@ -62,15 +62,15 @@ static struct sk_buff *alloc_tx(struct atm_vcc *vcc,unsigned int size) 
	struct sk_buff *skb;

	struct sock *sk = sk_atm(vcc);



	if (atomic_read(&sk->sk_wmem_alloc) && !atm_may_send(vcc, size)) {

	if (sk_wmem_alloc_get(sk) && !atm_may_send(vcc, size)) {

		pr_debug("Sorry: wmem_alloc = %d, size = %d, sndbuf = %d\n",

			atomic_read(&sk->sk_wmem_alloc), size,

			sk_wmem_alloc_get(sk), size,

			sk->sk_sndbuf);

		return NULL;

	}

	while (!(skb = alloc_skb(size,GFP_KERNEL))) schedule();

	pr_debug("AlTx %d += %d\n", atomic_read(&sk->sk_wmem_alloc),

		skb->truesize);

	while (!(skb = alloc_skb(size, GFP_KERNEL)))

		schedule();

	pr_debug("AlTx %d += %d\n", sk_wmem_alloc_get(sk), skb->truesize);

	atomic_add(skb->truesize, &sk->sk_wmem_alloc);

	return skb;

}
@@ -145,7 +145,7 @@ int vcc_create(struct net *net, struct socket *sock, int protocol, int family) 
	memset(&vcc->local,0,sizeof(struct sockaddr_atmsvc));

	memset(&vcc->remote,0,sizeof(struct sockaddr_atmsvc));

	vcc->qos.txtp.max_sdu = 1 << 16; /* for meta VCs */

	atomic_set(&sk->sk_wmem_alloc, 0);

	atomic_set(&sk->sk_wmem_alloc, 1);

	atomic_set(&sk->sk_rmem_alloc, 0);

	vcc->push = NULL;

	vcc->pop = NULL;

net/atm/ioctl.c

+1 −2
Original line number Diff line number Diff line
@@ -63,8 +63,7 @@ static int do_vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg 
				error =  -EINVAL;

				goto done;

			}

			error = put_user(sk->sk_sndbuf -

					 atomic_read(&sk->sk_wmem_alloc),

			error = put_user(sk->sk_sndbuf - sk_wmem_alloc_get(sk),

					 (int __user *) argp) ? -EFAULT : 0;

			goto done;

		case SIOCINQ:

net/atm/proc.c

+2 −2
Original line number Diff line number Diff line
@@ -204,8 +204,8 @@ static void vcc_info(struct seq_file *seq, struct atm_vcc *vcc) 
			seq_printf(seq, "%3d", sk->sk_family);

	}

	seq_printf(seq, " %04lx  %5d %7d/%7d %7d/%7d [%d]\n", vcc->flags, sk->sk_err,

		  atomic_read(&sk->sk_wmem_alloc), sk->sk_sndbuf,

		  atomic_read(&sk->sk_rmem_alloc), sk->sk_rcvbuf,

		  sk_wmem_alloc_get(sk), sk->sk_sndbuf,

		  sk_rmem_alloc_get(sk), sk->sk_rcvbuf,

		  atomic_read(&sk->sk_refcnt));

}

net/atm/raw.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ static void atm_pop_raw(struct atm_vcc *vcc,struct sk_buff *skb) 
	struct sock *sk = sk_atm(vcc);



	pr_debug("APopR (%d) %d -= %d\n", vcc->vci,

		atomic_read(&sk->sk_wmem_alloc), skb->truesize);

		sk_wmem_alloc_get(sk), skb->truesize);

	atomic_sub(skb->truesize, &sk->sk_wmem_alloc);

	dev_kfree_skb_any(skb);

	sk->sk_write_space(sk);