diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-07-09 12:43:23 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-07-09 17:03:18 +0200 |
| commit | fa2435903fb161591e49e3ec73307567d2a4ae07 (patch) | |
| tree | be67a85cb3cab27b19a011ddb53b91c78b7fe9a3 /target/linux/generic/pending-4.19/630-packet_socket_type.patch | |
| parent | 0051fff1711849d061f01dcf0aa486f60df1e50a (diff) | |
| download | upstream-fa2435903fb161591e49e3ec73307567d2a4ae07.tar.gz upstream-fa2435903fb161591e49e3ec73307567d2a4ae07.tar.bz2 upstream-fa2435903fb161591e49e3ec73307567d2a4ae07.zip | |
kernel: bump 4.19 to 4.19.57
Refreshed all patches.
Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/pending-4.19/630-packet_socket_type.patch')
| -rw-r--r-- | target/linux/generic/pending-4.19/630-packet_socket_type.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/pending-4.19/630-packet_socket_type.patch b/target/linux/generic/pending-4.19/630-packet_socket_type.patch index 333d4f5739..1e4b075e8d 100644 --- a/target/linux/generic/pending-4.19/630-packet_socket_type.patch +++ b/target/linux/generic/pending-4.19/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; -@@ -3237,6 +3239,7 @@ static int packet_create(struct net *net +@@ -3251,6 +3253,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; -@@ -3848,6 +3851,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3862,6 +3865,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; } -@@ -3900,6 +3913,13 @@ static int packet_getsockopt(struct sock +@@ -3914,6 +3927,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; @@ -128,7 +128,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> break; --- a/net/packet/internal.h +++ b/net/packet/internal.h -@@ -131,6 +131,7 @@ struct packet_sock { +@@ -132,6 +132,7 @@ struct packet_sock { struct net_device __rcu *cached_dev; int (*xmit)(struct sk_buff *skb); struct packet_type prot_hook ____cacheline_aligned_in_smp; |