From 01793e8752aa8211d6d74c92722787c403e5420d Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Tue, 28 Aug 2018 16:10:40 +0200 Subject: kernel: bump 4.14 to 4.14.67 Refreshed all patches. Removed upstreamed patches: - 037-v4.18-0008-ARM-dts-BCM5301x-Fix-i2c-controller-interrupt-type.patch Compile-tested on: cns3xxx, imx6 Runtime-tested on: cns3xxx, imx6 Signed-off-by: Koen Vandeputte --- .../171-usb-dwc2-Fix-inefficient-copy-of-unaligned-buffers.patch | 4 ++-- target/linux/generic/pending-4.14/630-packet_socket_type.patch | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'target/linux/generic/pending-4.14') diff --git a/target/linux/generic/pending-4.14/171-usb-dwc2-Fix-inefficient-copy-of-unaligned-buffers.patch b/target/linux/generic/pending-4.14/171-usb-dwc2-Fix-inefficient-copy-of-unaligned-buffers.patch index 78e6a7ef87..588b571e01 100644 --- a/target/linux/generic/pending-4.14/171-usb-dwc2-Fix-inefficient-copy-of-unaligned-buffers.patch +++ b/target/linux/generic/pending-4.14/171-usb-dwc2-Fix-inefficient-copy-of-unaligned-buffers.patch @@ -22,7 +22,7 @@ Signed-off-by: Antti Seppälä --- a/drivers/usb/dwc2/hcd.c +++ b/drivers/usb/dwc2/hcd.c -@@ -2631,6 +2631,7 @@ static void dwc2_hc_init_xfer(struct dwc +@@ -2669,6 +2669,7 @@ static int dwc2_alloc_split_dma_aligned_ static void dwc2_free_dma_aligned_buffer(struct urb *urb) { void *stored_xfer_buffer; @@ -30,7 +30,7 @@ Signed-off-by: Antti Seppälä if (!(urb->transfer_flags & URB_ALIGNED_TEMP_BUFFER)) return; -@@ -2639,9 +2640,14 @@ static void dwc2_free_dma_aligned_buffer +@@ -2677,9 +2678,14 @@ static void dwc2_free_dma_aligned_buffer memcpy(&stored_xfer_buffer, urb->transfer_buffer + urb->transfer_buffer_length, sizeof(urb->transfer_buffer)); diff --git a/target/linux/generic/pending-4.14/630-packet_socket_type.patch b/target/linux/generic/pending-4.14/630-packet_socket_type.patch index 82e2c51afd..e1736214f5 100644 --- a/target/linux/generic/pending-4.14/630-packet_socket_type.patch +++ b/target/linux/generic/pending-4.14/630-packet_socket_type.patch @@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -3260,6 +3262,7 @@ static int packet_create(struct net *net +@@ -3262,6 +3264,7 @@ static int packet_create(struct net *net mutex_init(&po->pg_vec_lock); po->rollover = NULL; po->prot_hook.func = packet_rcv; @@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau if (sock->type == SOCK_PACKET) po->prot_hook.func = packet_rcv_spkt; -@@ -3873,6 +3876,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3875,6 +3878,16 @@ packet_setsockopt(struct socket *sock, i po->xmit = val ? packet_direct_xmit : dev_queue_xmit; return 0; } @@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau default: return -ENOPROTOOPT; } -@@ -3925,6 +3938,13 @@ static int packet_getsockopt(struct sock +@@ -3927,6 +3940,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; -- cgit v1.2.3