diff options
| author | John Audia <graysky@archlinux.us> | 2021-06-30 16:57:44 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-07-17 13:21:03 +0200 |
| commit | f529c8463f82266538b19e9ad888ee9d6de412c1 (patch) | |
| tree | 0b618156a8c6f148c0a046e9a9a9dbd02150fcf3 /target/linux/generic/pending-5.4/630-packet_socket_type.patch | |
| parent | 479a2a90f782209b29dd9746d241fc1e67836309 (diff) | |
| download | upstream-f529c8463f82266538b19e9ad888ee9d6de412c1.tar.gz upstream-f529c8463f82266538b19e9ad888ee9d6de412c1.tar.bz2 upstream-f529c8463f82266538b19e9ad888ee9d6de412c1.zip | |
kernel: bump 5.4 to 5.4.129
All patches automatically rebased.
Build system: x86_64
Build-tested: ipq806x/R7800
Run-tested: ipq806x/R7800
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/generic/pending-5.4/630-packet_socket_type.patch')
| -rw-r--r-- | target/linux/generic/pending-5.4/630-packet_socket_type.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-5.4/630-packet_socket_type.patch b/target/linux/generic/pending-5.4/630-packet_socket_type.patch index a137fb5a6d..d9bfda1303 100644 --- a/target/linux/generic/pending-5.4/630-packet_socket_type.patch +++ b/target/linux/generic/pending-5.4/630-packet_socket_type.patch @@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (sock->type == SOCK_PACKET) po->prot_hook.func = packet_rcv_spkt; -@@ -3922,6 +3925,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3924,6 +3927,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; } -@@ -3978,6 +3991,13 @@ static int packet_getsockopt(struct sock +@@ -3980,6 +3993,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; |