mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Max Vozeler <max@vozeler.com>
To: gregkh@suse.de
Cc: hirofuchi@users.sourceforge.net, rpjday@crashcourse.ca,
	bgmerrell@novell.com, devel@driverdev.osuosl.org,
	linux-kernel@vger.kernel.org, mwehby@luxotticaRetail.com,
	marco@optikam.com, Max Vozeler <max@vozeler.com>
Subject: [PATCH 5/7] staging: usbip: vhci: friendly log messages for connection errors
Date: Wed, 12 Jan 2011 15:02:03 +0200	[thread overview]
Message-ID: <1294837325-26187-6-git-send-email-max@vozeler.com> (raw)
In-Reply-To: <1294837325-26187-1-git-send-email-max@vozeler.com>

Also changes the event on connection close to be
VDEV_EVENT_DOWN - no functional change.

Signed-off-by: Max Vozeler <max@vozeler.com>
---
 drivers/staging/usbip/vhci_rx.c |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/usbip/vhci_rx.c b/drivers/staging/usbip/vhci_rx.c
index bdbedd2..ac15cea 100644
--- a/drivers/staging/usbip/vhci_rx.c
+++ b/drivers/staging/usbip/vhci_rx.c
@@ -205,11 +205,23 @@ static void vhci_rx_pdu(struct usbip_device *ud)
 
 	memset(&pdu, 0, sizeof(pdu));
 
-
 	/* 1. receive a pdu header */
 	ret = usbip_xmit(0, ud->tcp_socket, (char *) &pdu, sizeof(pdu), 0);
+	if (ret < 0) {
+		if (ret == -ECONNRESET)
+			usbip_uinfo("connection reset by peer\n");
+		else if (ret != -ERESTARTSYS)
+			usbip_uinfo("xmit failed %d\n", ret);
+		usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
+		return;
+	}
+	if (ret == 0) {
+		usbip_uinfo("connection closed");
+		usbip_event_add(ud, VDEV_EVENT_DOWN);
+		return;
+	}
 	if (ret != sizeof(pdu)) {
-		usbip_uerr("receiving pdu failed! size is %d, should be %d\n",
+		usbip_uerr("received pdu size is %d, should be %d\n",
 					ret, (unsigned int)sizeof(pdu));
 		usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
 		return;
-- 
1.7.2.3


  parent reply	other threads:[~2011-01-12 13:22 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-12 13:01 [PATCH 0/7] staging/usbip fixes Max Vozeler
2011-01-12 13:01 ` [PATCH 1/7] staging: usbip: stub: update refcounts for devices and interfaces Max Vozeler
2011-01-12 13:02 ` [PATCH 2/7] staging: usbip: vhci: update reference count for usb_device Max Vozeler
2011-01-12 13:02 ` [PATCH 3/7] staging: usbip: vhci: give back URBs from in-flight unlink requests Max Vozeler
2011-01-12 13:02 ` [PATCH 4/7] staging: usbip: vhci: refuse to enqueue for dead connections Max Vozeler
2011-01-12 13:02 ` Max Vozeler [this message]
2011-01-12 13:02 ` [PATCH 6/7] staging: usbip: vhci: handle EAGAIN from SO_RCVTIMEO Max Vozeler
2011-01-12 13:02 ` [PATCH 7/7] staging: usbip: vhci: use urb->dev->portnum to find port Max Vozeler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1294837325-26187-6-git-send-email-max@vozeler.com \
    --to=max@vozeler.com \
    --cc=bgmerrell@novell.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=gregkh@suse.de \
    --cc=hirofuchi@users.sourceforge.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=marco@optikam.com \
    --cc=mwehby@luxotticaRetail.com \
    --cc=rpjday@crashcourse.ca \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®