diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-01-15 12:41:26 +0100 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-01-15 13:58:36 +0100 |
commit | 939fa07b041fef58196fba8dd4b5184adb7b4d3f (patch) | |
tree | 85df6f5dd68581ed42fc243153527b3e7c7c147d /target/linux/generic/pending-4.14/630-packet_socket_type.patch | |
parent | cae263227ffdec1bd0d005b7752f25b6ebc6f8fa (diff) | |
download | upstream-939fa07b041fef58196fba8dd4b5184adb7b4d3f.tar.gz upstream-939fa07b041fef58196fba8dd4b5184adb7b4d3f.tar.bz2 upstream-939fa07b041fef58196fba8dd4b5184adb7b4d3f.zip |
kernel: bump 4.14 to 4.14.93
Refreshed all patches.
Remove upstreamed:
- 510-f2fs-fix-sanity_check_raw_super-on-big-endian-machines.patch
Compile-tested on: cns3xxx, imx6
Runtime-tested on: cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/pending-4.14/630-packet_socket_type.patch')
-rw-r--r-- | target/linux/generic/pending-4.14/630-packet_socket_type.patch | 6 |
1 files changed, 3 insertions, 3 deletions
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 d55d678549..e8eae3b7ff 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 <nbd@nbd.name> if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -3265,6 +3267,7 @@ static int packet_create(struct net *net +@@ -3269,6 +3271,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 <nbd@nbd.name> if (sock->type == SOCK_PACKET) po->prot_hook.func = packet_rcv_spkt; -@@ -3878,6 +3881,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3882,6 +3885,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 <nbd@nbd.name> default: return -ENOPROTOOPT; } -@@ -3930,6 +3943,13 @@ static int packet_getsockopt(struct sock +@@ -3934,6 +3947,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; |