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

Commit 7e249c8b authored by Max Vozeler's avatar Max Vozeler Committed by Greg Kroah-Hartman
Browse files

staging: usbip: vhci: friendly log messages for connection errors 



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

Signed-off-by: default avatarMax Vozeler <max@vozeler.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 6d212153

drivers/staging/usbip/vhci_rx.c

+14 −2
Original line number Original line Diff line number Diff line
@@ -205,11 +205,23 @@ static void vhci_rx_pdu(struct usbip_device *ud) 




	memset(&pdu, 0, sizeof(pdu));

	memset(&pdu, 0, sizeof(pdu));







	/* 1. receive a pdu header */

	/* 1. receive a pdu header */

	ret = usbip_xmit(0, ud->tcp_socket, (char *) &pdu, sizeof(pdu), 0);

	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)) {

	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));

					ret, (unsigned int)sizeof(pdu));

		usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);

		usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);

		return;

		return;