* [PATCH] VSOCK: Only check error on skb_recv_datagram when skb is NULL
@ 2016-04-19 6:58 Jorgen Hansen
2016-04-20 0:42 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Jorgen Hansen @ 2016-04-19 6:58 UTC (permalink / raw)
To: netdev, linux-kernel, virtualization
Cc: gregkh, davem, pv-drivers, Jorgen Hansen
If skb_recv_datagram returns an skb, we should ignore the err
value returned. Otherwise, datagram receives will return EAGAIN
when they have to wait for a datagram.
Acked-by: Adit Ranadive <aditr@vmware.com>
Signed-off-by: Jorgen Hansen <jhansen@vmware.com>
---
net/vmw_vsock/vmci_transport.c | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c
index 662bdd2..5621473 100644
--- a/net/vmw_vsock/vmci_transport.c
+++ b/net/vmw_vsock/vmci_transport.c
@@ -1735,11 +1735,8 @@ static int vmci_transport_dgram_dequeue(struct vsock_sock *vsk,
/* Retrieve the head sk_buff from the socket's receive queue. */
err = 0;
skb = skb_recv_datagram(&vsk->sk, flags, noblock, &err);
- if (err)
- return err;
-
if (!skb)
- return -EAGAIN;
+ return err;
dg = (struct vmci_datagram *)skb->data;
if (!dg)
@@ -2154,7 +2151,7 @@ module_exit(vmci_transport_exit);
MODULE_AUTHOR("VMware, Inc.");
MODULE_DESCRIPTION("VMCI transport for Virtual Sockets");
-MODULE_VERSION("1.0.3.0-k");
+MODULE_VERSION("1.0.4.0-k");
MODULE_LICENSE("GPL v2");
MODULE_ALIAS("vmware_vsock");
MODULE_ALIAS_NETPROTO(PF_VSOCK);
--
1.7.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] VSOCK: Only check error on skb_recv_datagram when skb is NULL
2016-04-19 6:58 [PATCH] VSOCK: Only check error on skb_recv_datagram when skb is NULL Jorgen Hansen
@ 2016-04-20 0:42 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2016-04-20 0:42 UTC (permalink / raw)
To: jhansen; +Cc: netdev, linux-kernel, virtualization, gregkh, pv-drivers
From: Jorgen Hansen <jhansen@vmware.com>
Date: Mon, 18 Apr 2016 23:58:52 -0700
> If skb_recv_datagram returns an skb, we should ignore the err
> value returned. Otherwise, datagram receives will return EAGAIN
> when they have to wait for a datagram.
>
> Acked-by: Adit Ranadive <aditr@vmware.com>
> Signed-off-by: Jorgen Hansen <jhansen@vmware.com>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-04-20 0:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-04-19 6:58 [PATCH] VSOCK: Only check error on skb_recv_datagram when skb is NULL Jorgen Hansen
2016-04-20 0:42 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).