diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-05-13 13:41:34 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-05-13 19:17:41 +0200 |
| commit | 86fd8cb435daf05f52468daabd41a363917485b7 (patch) | |
| tree | 9997cc8eb0b05a150b73f8bcbea8c7cf327ab07f /target/linux/generic/pending-4.19/630-packet_socket_type.patch | |
| parent | 09050b6fe22848c6b8d59a437e357c7ad34bc523 (diff) | |
| download | upstream-86fd8cb435daf05f52468daabd41a363917485b7.tar.gz upstream-86fd8cb435daf05f52468daabd41a363917485b7.tar.bz2 upstream-86fd8cb435daf05f52468daabd41a363917485b7.zip | |
kernel: bump 4.19 to 4.19.42
Refreshed all patches.
Remove upstreamed:
- 060-v5.1-serial-ar933x_uart-Fix-build-failure-with-disabled-c.patch
- 400-v5.2-leds-trigger-netdev-fix-refcnt-leak-on-interface-ren.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.19/630-packet_socket_type.patch')
| -rw-r--r-- | target/linux/generic/pending-4.19/630-packet_socket_type.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/pending-4.19/630-packet_socket_type.patch b/target/linux/generic/pending-4.19/630-packet_socket_type.patch index a0d177586a..333d4f5739 100644 --- a/target/linux/generic/pending-4.19/630-packet_socket_type.patch +++ b/target/linux/generic/pending-4.19/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; -@@ -3233,6 +3235,7 @@ static int packet_create(struct net *net +@@ -3237,6 +3239,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; -@@ -3844,6 +3847,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3848,6 +3851,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; } -@@ -3896,6 +3909,13 @@ static int packet_getsockopt(struct sock +@@ -3900,6 +3913,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; |