From 73bba470a46c5f46d9c50002be2a7d2cb7a90792 Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Tue, 27 Aug 2019 12:32:17 +0200 Subject: kernel: bump 4.14 to 4.14.140 Refreshed all patches. Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte --- target/linux/generic/pending-4.14/630-packet_socket_type.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'target/linux/generic/pending-4.14/630-packet_socket_type.patch') 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 57b076c559..8dbe06023e 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; -@@ -3287,6 +3289,7 @@ static int packet_create(struct net *net +@@ -3294,6 +3296,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; -@@ -3900,6 +3903,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3907,6 +3910,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; } -@@ -3952,6 +3965,13 @@ static int packet_getsockopt(struct sock +@@ -3959,6 +3972,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; -- cgit v1.2.3