usb: refresh

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

1 files changed, 17 insertions, 16 deletions

diff --git a/queue/usbip-vhci-stop-printing-kernel-pointer-addresses-in.patch b/queue/usbip-vhci-stop-printing-kernel-pointer-addresses-in.patch
index 8e4143e..19ec5b5 100644
--- a/queue/usbip-vhci-stop-printing-kernel-pointer-addresses-in.patch
+++ b/queue/usbip-vhci-stop-printing-kernel-pointer-addresses-in.patch
@@ -1,4 +1,4 @@
-From 8272d099d05f7ab2776cf56a2ab9f9443be18907 Mon Sep 17 00:00:00 2001
+From 0081e0b39a06f432df571ac0702507a4995c748c Mon Sep 17 00:00:00 2001
 From: Shuah Khan <shuahkh@osg.samsung.com>
 Date: Mon, 18 Dec 2017 17:24:22 -0700
 Subject: [PATCH] usbip: vhci: stop printing kernel pointer addresses in
@@ -12,12 +12,13 @@ kernel pointer addresses.
 Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
 Cc: stable <stable@vger.kernel.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/usb/usbip/vhci_hcd.c b/drivers/usb/usbip/vhci_hcd.c
-index 6b3278c4b72a..9efab3dc3734 100644
+index 1485603890c9..c4a6bf4504af 100644
 --- a/drivers/usb/usbip/vhci_hcd.c
 +++ b/drivers/usb/usbip/vhci_hcd.c
-@@ -656,9 +656,6 @@ static int vhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flag
+@@ -480,9 +480,6 @@ static int vhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb,
  	struct vhci_device *vdev;
  	unsigned long flags;
  
@@ -27,7 +28,7 @@ index 6b3278c4b72a..9efab3dc3734 100644
  	if (portnum > VHCI_HC_PORTS) {
  		pr_err("invalid port number %d\n", portnum);
  		return -ENODEV;
-@@ -822,8 +819,6 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
+@@ -645,8 +642,6 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
  	struct vhci_device *vdev;
  	unsigned long flags;
  
@@ -36,7 +37,7 @@ index 6b3278c4b72a..9efab3dc3734 100644
  	spin_lock_irqsave(&vhci->lock, flags);
  
  	priv = urb->hcpriv;
-@@ -851,7 +846,6 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
+@@ -674,7 +669,6 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
  		/* tcp connection is closed */
  		spin_lock(&vdev->priv_lock);
  
@@ -44,7 +45,7 @@ index 6b3278c4b72a..9efab3dc3734 100644
  		list_del(&priv->list);
  		kfree(priv);
  		urb->hcpriv = NULL;
-@@ -863,8 +857,6 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
+@@ -686,8 +680,6 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
  		 * vhci_rx will receive RET_UNLINK and give back the URB.
  		 * Otherwise, we give back it here.
  		 */
@@ -53,7 +54,7 @@ index 6b3278c4b72a..9efab3dc3734 100644
  		usb_hcd_unlink_urb_from_ep(hcd, urb);
  
  		spin_unlock_irqrestore(&vhci->lock, flags);
-@@ -892,8 +884,6 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
+@@ -715,8 +707,6 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
  
  		unlink->unlink_seqnum = priv->seqnum;
  
@@ -63,10 +64,10 @@ index 6b3278c4b72a..9efab3dc3734 100644
  		 * peer */
  		list_add_tail(&unlink->list, &vdev->unlink_tx);
 diff --git a/drivers/usb/usbip/vhci_rx.c b/drivers/usb/usbip/vhci_rx.c
-index 90577e8b2282..112ebb90d8c9 100644
+index fc2d319e2360..5943deeec115 100644
 --- a/drivers/usb/usbip/vhci_rx.c
 +++ b/drivers/usb/usbip/vhci_rx.c
-@@ -23,24 +23,23 @@ struct urb *pickup_urb_and_free_priv(struct vhci_device *vdev, __u32 seqnum)
+@@ -37,24 +37,23 @@ struct urb *pickup_urb_and_free_priv(struct vhci_device *vdev, __u32 seqnum)
  		urb = priv->urb;
  		status = urb->status;
  
@@ -98,7 +99,7 @@ index 90577e8b2282..112ebb90d8c9 100644
  		}
  
  		list_del(&priv->list);
-@@ -67,8 +66,8 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
+@@ -80,8 +79,8 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
  	spin_unlock_irqrestore(&vdev->priv_lock, flags);
  
  	if (!urb) {
@@ -106,10 +107,10 @@ index 90577e8b2282..112ebb90d8c9 100644
 -		pr_info("max seqnum %d\n",
 +		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;
-@@ -91,7 +90,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
+@@ -104,7 +103,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
  	if (usbip_dbg_flag_vhci_rx)
  		usbip_dump_urb(urb);
  
@@ -117,8 +118,8 @@ index 90577e8b2282..112ebb90d8c9 100644
 +	usbip_dbg_vhci_rx("now giveback urb %u\n", pdu->base.seqnum);
  
  	spin_lock_irqsave(&vhci->lock, flags);
- 	usb_hcd_unlink_urb_from_ep(vhci_hcd_to_hcd(vhci_hcd), urb);
-@@ -158,7 +157,7 @@ static void vhci_recv_ret_unlink(struct vhci_device *vdev,
+ 	usb_hcd_unlink_urb_from_ep(vhci_to_hcd(vhci), urb);
+@@ -170,7 +169,7 @@ static void vhci_recv_ret_unlink(struct vhci_device *vdev,
  		pr_info("the urb (seqnum %d) was already given back\n",
  			pdu->base.seqnum);
  	} else {
@@ -128,10 +129,10 @@ index 90577e8b2282..112ebb90d8c9 100644
  		/* If unlink is successful, status is -ECONNRESET */
  		urb->status = pdu->u.ret_unlink.status;
 diff --git a/drivers/usb/usbip/vhci_tx.c b/drivers/usb/usbip/vhci_tx.c
-index d625a2ff4b71..9aed15a358b7 100644
+index 3e7878fe2fd4..a9a663a578b6 100644
 --- a/drivers/usb/usbip/vhci_tx.c
 +++ b/drivers/usb/usbip/vhci_tx.c
-@@ -69,7 +69,8 @@ static int vhci_send_cmd_submit(struct vhci_device *vdev)
+@@ -83,7 +83,8 @@ static int vhci_send_cmd_submit(struct vhci_device *vdev)
  		memset(&msg, 0, sizeof(msg));
  		memset(&iov, 0, sizeof(iov));