diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2021-07-29 22:42:38 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-07-31 19:21:01 +0200 |
commit | 2d5ee43dc6390d84620807c741d2cb0e272b49ce (patch) | |
tree | 8a446db7162217f8536fd099bc4d027aa591e091 /target/linux/bcm27xx/patches-5.4/950-0993-xhci-quirks-add-link-TRB-quirk-for-VL805.patch | |
parent | a205de55941b025f6f85ac19005496c726d6e157 (diff) | |
download | upstream-2d5ee43dc6390d84620807c741d2cb0e272b49ce.tar.gz upstream-2d5ee43dc6390d84620807c741d2cb0e272b49ce.tar.bz2 upstream-2d5ee43dc6390d84620807c741d2cb0e272b49ce.zip |
kernel: bump 5.4 to 5.4.137
Manually rebased
generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
All others updated automatically.
Compile-tested on: ramips/mt7621, armvirt/32
Runtime-tested on: ramips/mt7621, armvirt/32
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0993-xhci-quirks-add-link-TRB-quirk-for-VL805.patch')
-rw-r--r-- | target/linux/bcm27xx/patches-5.4/950-0993-xhci-quirks-add-link-TRB-quirk-for-VL805.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0993-xhci-quirks-add-link-TRB-quirk-for-VL805.patch b/target/linux/bcm27xx/patches-5.4/950-0993-xhci-quirks-add-link-TRB-quirk-for-VL805.patch index 355421ee26..149fd08d06 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0993-xhci-quirks-add-link-TRB-quirk-for-VL805.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0993-xhci-quirks-add-link-TRB-quirk-for-VL805.patch @@ -32,7 +32,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com> if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c -@@ -624,6 +624,16 @@ void xhci_find_new_dequeue_state(struct +@@ -647,6 +647,16 @@ void xhci_find_new_dequeue_state(struct } while (!cycle_found || !td_last_trb_found); @@ -51,7 +51,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com> --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1876,6 +1876,7 @@ struct xhci_hcd { +@@ -1877,6 +1877,7 @@ struct xhci_hcd { #define XHCI_EP_CTX_BROKEN_DCS BIT_ULL(36) #define XHCI_SKIP_PHY_INIT BIT_ULL(37) #define XHCI_DISABLE_SPARSE BIT_ULL(38) |