lkml.org 
[lkml]   [2011]   [Jan]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5/7] staging: usbip: vhci: friendly log messages for connection errors
    Date
    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


    \
     
     \ /
      Last update: 2011-01-12 14:25    [W:0.047 / U:119.124 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site