--- zzzz-none-000/linux-4.4.60/include/linux/usb/hcd.h	2017-04-08 07:53:53.000000000 +0000
+++ wasp-540e-714/linux-4.4.60/include/linux/usb/hcd.h	2019-07-03 09:21:34.000000000 +0000
@@ -23,6 +23,11 @@
 
 #include <linux/rwsem.h>
 #include <linux/interrupt.h>
+#include <linux/usb/suspend.h>
+
+#ifdef CONFIG_AVM_NET_TRACE
+#include "avmusbtrace.h"
+#endif
 
 #define MAX_TOPO_LEVEL		6
 
@@ -157,6 +162,9 @@
 	unsigned		amd_resume_bug:1; /* AMD remote wakeup quirk */
 	unsigned		can_do_streams:1; /* HC supports streams */
 	unsigned		tpl_support:1; /* OTG & EH TPL support */
+	unsigned		usb3_dev_reset_quirk:1; /* USB device reset
+							 * quirk.
+							 */
 	unsigned		cant_recv_wakeups:1;
 			/* wakeup requests from downstream aren't received */
 
@@ -185,6 +193,7 @@
 	struct usb_hcd		*shared_hcd;
 	struct usb_hcd		*primary_hcd;
 
+	struct usb_susphy	*susphy;
 
 #define HCD_BUFFER_POOLS	4
 	struct dma_pool		*pool[HCD_BUFFER_POOLS];
@@ -208,6 +217,10 @@
 	 * input size of periodic table to an interrupt scheduler.
 	 * (ohci 32, uhci 1024, ehci 256/512/1024).
 	 */
+	 
+#ifdef AVM_USB_TRACE
+	struct avm_net_trace_device *avm_ntd;
+#endif
 
 	/* The HC driver's private data is stored at the end of
 	 * this structure.
@@ -460,7 +473,14 @@
 extern void usb_hcd_pci_remove(struct pci_dev *dev);
 extern void usb_hcd_pci_shutdown(struct pci_dev *dev);
 
+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
 extern int usb_hcd_amd_remote_wakeup_quirk(struct pci_dev *dev);
+#else
+static inline int usb_hcd_amd_remote_wakeup_quirk(struct pci_dev *dev)
+{
+	return 0;
+}
+#endif
 
 #ifdef CONFIG_PM
 extern const struct dev_pm_ops usb_hcd_pci_pm_ops;