diff options
| author | John Audia <graysky@archlinux.us> | 2022-04-27 14:14:45 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-05-01 14:13:15 +0200 |
| commit | d90c7621f40fde2dd01d08b4463cde755173b6ed (patch) | |
| tree | 022690f0e7d53e5a60124848a61fa0e0a9120a99 /target/linux/generic/pending-5.10/630-packet_socket_type.patch | |
| parent | e9c14fa85f4d517ad1729b4b2a1a5ba1b316f189 (diff) | |
| download | upstream-d90c7621f40fde2dd01d08b4463cde755173b6ed.tar.gz upstream-d90c7621f40fde2dd01d08b4463cde755173b6ed.tar.bz2 upstream-d90c7621f40fde2dd01d08b4463cde755173b6ed.zip | |
kernel: bump 5.10 to 5.10.113
All patches automatically rebased.
Build system: x86_64
Build-tested: bcm2711/RPi4B, mt7622/RT3200
Run-tested: bcm2711/RPi4B, mt7622/RT3200
Signed-off-by: John Audia <graysky@archlinux.us>
(cherry picked from commit e08942e76a162962892020a0f7e52ef751ec68e4)
Diffstat (limited to 'target/linux/generic/pending-5.10/630-packet_socket_type.patch')
| -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 5b396c3a8c..26fd8bc754 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; -@@ -3325,6 +3327,7 @@ static int packet_create(struct net *net +@@ -3330,6 +3332,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; -@@ -3969,6 +3972,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3974,6 +3977,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; } -@@ -4025,6 +4038,13 @@ static int packet_getsockopt(struct sock +@@ -4030,6 +4043,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; |