diff options
author | Rui Salvaterra <rsalvaterra@gmail.com> | 2022-03-23 09:47:19 +0000 |
---|---|---|
committer | Daniel Golle <daniel@makrotopia.org> | 2022-03-27 16:14:00 +0100 |
commit | 1e35d95a5bfac3896df0855f13afdfe6e132d5b1 (patch) | |
tree | 109cfafa0ac59b65e57e378db31c1cda5b1cb99f /target/linux/generic | |
parent | 0c49efd210a8a2502db76e4a884eedc8342a4442 (diff) | |
download | upstream-1e35d95a5bfac3896df0855f13afdfe6e132d5b1.tar.gz upstream-1e35d95a5bfac3896df0855f13afdfe6e132d5b1.tar.bz2 upstream-1e35d95a5bfac3896df0855f13afdfe6e132d5b1.zip |
kernel: bump 5.10 to 5.10.108
Patches automatically rebased.
Build system: x86_64
Build-tested: bcm2711/RPi4B, mt7622/RT3200
Run-tested: bcm2711/RPi4B, mt7622/RT3200
Tested-by: John Audia <graysky@archlinux.us>
Build-tested: ath79/generic, ramips/mt76{20,21,x8}, ipq40xx, mvebu, realtek/rtl{838,930}x, x86/64
Run-tested: ramips/mt7621, mvebu
Tested-by: Stijn Segers <foss@volatilesystems.org>
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
(cherry picked from commit 2c26eb4e484fe6d7a8159a22f97b6db7ca6e9221)
Diffstat (limited to 'target/linux/generic')
-rw-r--r-- | target/linux/generic/pending-5.10/630-packet_socket_type.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/pending-5.10/630-packet_socket_type.patch b/target/linux/generic/pending-5.10/630-packet_socket_type.patch index bf319d4bac..5b396c3a8c 100644 --- a/target/linux/generic/pending-5.10/630-packet_socket_type.patch +++ b/target/linux/generic/pending-5.10/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; -@@ -3322,6 +3324,7 @@ static int packet_create(struct net *net +@@ -3325,6 +3327,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; -@@ -3960,6 +3963,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3969,6 +3972,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; } -@@ -4016,6 +4029,13 @@ static int packet_getsockopt(struct sock +@@ -4025,6 +4038,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; |