summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2009-09-20 06:32:55 +0000
committerDavid S. Miller <davem@davemloft.net>2009-09-22 14:00:14 -0700
commit407fc5cf019fc5cb990458a2e38d2c0a27b3cb30 (patch)
treed5cf7588ae0825378e7a3d09f6228520e9a542e9
parent5d5baa92664e66f63b75abc51fbcd0b96d81f5d8 (diff)
downloadop-kernel-dev-407fc5cf019fc5cb990458a2e38d2c0a27b3cb30.zip
op-kernel-dev-407fc5cf019fc5cb990458a2e38d2c0a27b3cb30.tar.gz
ax25: Fix SIOCAX25GETINFO ioctl
rcv_q & snd_q initializations were reversed in commit 31e6d363abcd0d05766c82f1a9c905a4c974a199 (net: correct off-by-one write allocations reports) Signed-off-by: Jan Rafaj <jr+netfilter-devel@cedric.unob.cz> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ax25/af_ax25.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
index da0f64f..d6b1b05 100644
--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@ -1781,8 +1781,8 @@ static int ax25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
ax25_info.idletimer = ax25_display_timer(&ax25->idletimer) / (60 * HZ);
ax25_info.n2count = ax25->n2count;
ax25_info.state = ax25->state;
- ax25_info.rcv_q = sk_wmem_alloc_get(sk);
- ax25_info.snd_q = sk_rmem_alloc_get(sk);
+ ax25_info.rcv_q = sk_rmem_alloc_get(sk);
+ ax25_info.snd_q = sk_wmem_alloc_get(sk);
ax25_info.vs = ax25->vs;
ax25_info.vr = ax25->vr;
ax25_info.va = ax25->va;
OpenPOWER on IntegriCloud