diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-08-28 11:41:37 +0200 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-08-28 13:08:20 +0200 |
commit | 1bc31e0339352839780a2bb01c350e103f757d72 (patch) | |
tree | 0cbaab8d76d8a98fa5eac14159c9dc34da466063 /target/linux/generic | |
parent | b5407887bc67efb92e8a3beda81e372e1ad38dce (diff) | |
download | upstream-1bc31e0339352839780a2bb01c350e103f757d72.tar.gz upstream-1bc31e0339352839780a2bb01c350e103f757d72.tar.bz2 upstream-1bc31e0339352839780a2bb01c350e103f757d72.zip |
kernel: bump 4.19 to 4.19.68
Refreshed all patches.
Remove upstreamed:
- 950-0307-Revert-pwm-Set-class-for-exported-channels-in-sysfs.patch
Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic')
-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 1e4b075e8d..70cf88ddfa 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; -@@ -3251,6 +3253,7 @@ static int packet_create(struct net *net +@@ -3258,6 +3260,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; -@@ -3862,6 +3865,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3869,6 +3872,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; } -@@ -3914,6 +3927,13 @@ static int packet_getsockopt(struct sock +@@ -3921,6 +3934,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; |