diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-01-15 12:56:22 +0100 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-01-16 12:56:30 +0100 |
commit | 63a2ed3ba5bca13db3029e6eb8aa0c35872b73b9 (patch) | |
tree | 9e1ab8b617c8135c9702a084d8698bd26e4329fa /target/linux/generic/pending-4.9/630-packet_socket_type.patch | |
parent | 5be22ef2faad0cfb26ee38fe589c791c67444533 (diff) | |
download | upstream-63a2ed3ba5bca13db3029e6eb8aa0c35872b73b9.tar.gz upstream-63a2ed3ba5bca13db3029e6eb8aa0c35872b73b9.tar.bz2 upstream-63a2ed3ba5bca13db3029e6eb8aa0c35872b73b9.zip |
kernel: bump 4.9 to 4.9.150
Refreshed all patches.
Remove upstreamed:
- 096-mips-math-emu-Write-protect-delay-slot-emulation-pages.patch
Altered patches:
- 024-7-net-reorganize-struct-sock-for-better-data-locality.patch
Compile-tested on: ar7
Runtime-tested on: none
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/pending-4.9/630-packet_socket_type.patch')
-rw-r--r-- | target/linux/generic/pending-4.9/630-packet_socket_type.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/pending-4.9/630-packet_socket_type.patch b/target/linux/generic/pending-4.9/630-packet_socket_type.patch index 0bf9339d11..13a544736d 100644 --- a/target/linux/generic/pending-4.9/630-packet_socket_type.patch +++ b/target/linux/generic/pending-4.9/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; -@@ -3262,6 +3264,7 @@ static int packet_create(struct net *net +@@ -3266,6 +3268,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; -@@ -3875,6 +3878,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3879,6 +3882,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; } -@@ -3927,6 +3940,13 @@ static int packet_getsockopt(struct sock +@@ -3931,6 +3944,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; |