fix up usbip build errors

diff --git a/queue-4.9/usbip-prevent-leaking-socket-pointer-address-in-messages.patch b/queue-4.9/usbip-prevent-leaking-socket-pointer-address-in-messages.patch
index 9a2818852fcdb97f710924c7b4616dc8ae3d9993..dbc49ac21165bfd2741cd31aa4cec41e28804843 100644 (file)
--- a/queue-4.9/usbip-prevent-leaking-socket-pointer-address-in-messages.patch
+++ b/queue-4.9/usbip-prevent-leaking-socket-pointer-address-in-messages.patch
@@ -28,7 +28,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        if (ud->tcp_socket) {
 -              dev_dbg(&sdev->udev->dev, "shutdown tcp_socket %p\n",
 -                      ud->tcp_socket);
-+              dev_dbg(&sdev->udev->dev, "shutdown sockfd %d\n", ud->sockfd);
++              dev_dbg(&sdev->udev->dev, "shutdown sockfd\n");
                kernel_sock_shutdown(ud->tcp_socket, SHUT_RDWR);
        }
  
@@ -71,7 +71,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        /* need this? see stub_dev.c */
        if (ud->tcp_socket) {
 -              pr_debug("shutdown tcp_socket %p\n", ud->tcp_socket);
-+              pr_debug("shutdown tcp_socket %d\n", ud->sockfd);
++              pr_debug("shutdown tcp_socket\n");
                kernel_sock_shutdown(ud->tcp_socket, SHUT_RDWR);
        }
  

diff --git a/queue-4.9/usbip-vhci-stop-printing-kernel-pointer-addresses-in-messages.patch b/queue-4.9/usbip-vhci-stop-printing-kernel-pointer-addresses-in-messages.patch
index 07b01f320aacb6f1a4c2b5a28051b07da4588bbf..5e75a3346f91971d4f07d394d862cd3d652ce77d 100644 (file)
--- a/queue-4.9/usbip-vhci-stop-printing-kernel-pointer-addresses-in-messages.patch
+++ b/queue-4.9/usbip-vhci-stop-printing-kernel-pointer-addresses-in-messages.patch
@@ -15,9 +15,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 ---
  drivers/usb/usbip/vhci_hcd.c |   10 ----------
- drivers/usb/usbip/vhci_rx.c  |   25 ++++++++++++-------------
+ drivers/usb/usbip/vhci_rx.c  |   23 +++++++++++------------
  drivers/usb/usbip/vhci_tx.c  |    3 ++-
- 3 files changed, 14 insertions(+), 24 deletions(-)
+ 3 files changed, 13 insertions(+), 23 deletions(-)
 
 --- a/drivers/usb/usbip/vhci_hcd.c
 +++ b/drivers/usb/usbip/vhci_hcd.c
@@ -100,19 +100,17 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
                }
  
                list_del(&priv->list);
-@@ -80,9 +79,9 @@ static void vhci_recv_ret_submit(struct
+@@ -80,8 +79,8 @@ static void vhci_recv_ret_submit(struct
        spin_unlock_irqrestore(&vdev->priv_lock, flags);
  
        if (!urb) {
 -              pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
 -              pr_info("max seqnum %d\n",
--                      atomic_read(&vhci->seqnum));
 +              pr_err("cannot find a urb of seqnum %u max seqnum %d\n",
 +                      pdu->base.seqnum,
-+                      atomic_read(&vhci_hcd->seqnum));
+                       atomic_read(&vhci->seqnum));
                usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
                return;
-       }
 @@ -104,7 +103,7 @@ static void vhci_recv_ret_submit(struct
        if (usbip_dbg_flag_vhci_rx)
                usbip_dump_urb(urb);