diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2023-01-28 19:09:19 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-01-28 19:26:47 +0100 |
| commit | 4292832a6a836aa89bf39675193c9c60870ed862 (patch) | |
| tree | bb93329bfb6149667b0492b1d530ff77c9da4549 /target/linux/generic/pending-5.4/630-packet_socket_type.patch | |
| parent | ac7386a15d1f050853e5160b5dc2227e200ec807 (diff) | |
| download | upstream-4292832a6a836aa89bf39675193c9c60870ed862.tar.gz upstream-4292832a6a836aa89bf39675193c9c60870ed862.tar.bz2 upstream-4292832a6a836aa89bf39675193c9c60870ed862.zip | |
kernel: bump 5.4 to 5.4.230
Compile-tested: x86/64
Run-tested: x86/64
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.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 | 10 |
1 files changed, 5 insertions, 5 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 54c087bf65..38323ab5f0 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 @@ -55,7 +55,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> goto out; if (!net_eq(dev_net(dev), sock_net(sk))) -@@ -2058,12 +2060,12 @@ static int packet_rcv(struct sk_buff *sk +@@ -2068,12 +2070,12 @@ static int packet_rcv(struct sk_buff *sk unsigned int snaplen, res; bool is_drop_n_account = false; @@ -71,7 +71,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -2189,12 +2191,12 @@ static int tpacket_rcv(struct sk_buff *s +@@ -2199,12 +2201,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; -@@ -3301,6 +3303,7 @@ static int packet_create(struct net *net +@@ -3310,6 +3312,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; -@@ -3944,6 +3947,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3952,6 +3955,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; } -@@ -4000,6 +4013,13 @@ static int packet_getsockopt(struct sock +@@ -4008,6 +4021,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; |