diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-02-25 11:38:50 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-02-25 17:33:16 +0100 |
| commit | f20fea9dcdbefb015ede43959478838d21a7eb3b (patch) | |
| tree | 8b48c86d806bcc4916f785cf4d8f5b41cc43c8bd /target/linux/generic/pending-4.19 | |
| parent | ceed0665cc68ee836806b0cc7ca496a858063ce2 (diff) | |
| download | upstream-f20fea9dcdbefb015ede43959478838d21a7eb3b.tar.gz upstream-f20fea9dcdbefb015ede43959478838d21a7eb3b.tar.bz2 upstream-f20fea9dcdbefb015ede43959478838d21a7eb3b.zip | |
kernel: bump 4.19 to 4.19.25
Refreshed all patches.
Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/pending-4.19')
| -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 273e7ff0a8..a0d177586a 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; -@@ -3232,6 +3234,7 @@ static int packet_create(struct net *net +@@ -3233,6 +3235,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; -@@ -3843,6 +3846,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3844,6 +3847,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; } -@@ -3895,6 +3908,13 @@ static int packet_getsockopt(struct sock +@@ -3896,6 +3909,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; |