diff options
author | John Audia <graysky@archlinux.us> | 2020-09-10 15:17:13 -0400 |
---|---|---|
committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-09-12 01:28:50 +0200 |
commit | bee76f1bfa13a1dad8706090a5b6a1dd36f3d9c1 (patch) | |
tree | ba288a8a4922007a82ede6b45292c88154044914 /target/linux/generic/pending-5.4/630-packet_socket_type.patch | |
parent | c4110a524e9a026cf570b6dadf325c037b7527d0 (diff) | |
download | upstream-bee76f1bfa13a1dad8706090a5b6a1dd36f3d9c1.tar.gz upstream-bee76f1bfa13a1dad8706090a5b6a1dd36f3d9c1.tar.bz2 upstream-bee76f1bfa13a1dad8706090a5b6a1dd36f3d9c1.zip |
kernel: bump 5.4 to 5.4.64
Remove upstreamed patches:
generic-backport
701-v5.5-net-core-use-listified-Rx-for-GRO_NORMAL-in-napi_gro.patch
Manually merged:
mediatek/patches-5.4
0603-net-dsa-mt7530-Extend-device-data-ready-for-adding-a.patch
All other modifications made by update_kernel.sh
Build-tested: ipq806x, lantiq/xrx200, mvebu, x86/64
Run-tested: ipq806x (R7800), mvebu (mamba, rango),
lantiq/xrx200 (Easybox 904 xDSL), x86/64
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
[add community build/run tests to commit message]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
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 | 8 |
1 files changed, 4 insertions, 4 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 f082aa1454..a137fb5a6d 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 @@ -71,7 +71,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -2184,12 +2186,12 @@ static int tpacket_rcv(struct sk_buff *s +@@ -2185,12 +2187,12 @@ static int tpacket_rcv(struct sk_buff *s BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h2)) != 32); BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h3)) != 48); @@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -3284,6 +3286,7 @@ static int packet_create(struct net *net +@@ -3289,6 +3291,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; -@@ -3917,6 +3920,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3922,6 +3925,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; } -@@ -3973,6 +3986,13 @@ static int packet_getsockopt(struct sock +@@ -3978,6 +3991,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; |