diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-08-24 17:58:52 +0200 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-08-28 23:06:47 +0200 |
commit | 5fde931d6071225e4383b33aaaa2131d49f55eee (patch) | |
tree | 7e801c60609b1a116d018c25ccc5ce30bb648172 /target/linux/generic/pending-4.9/630-packet_socket_type.patch | |
parent | 4bff3f392bf160146edf6cf2cea25f84e7d88e18 (diff) | |
download | upstream-5fde931d6071225e4383b33aaaa2131d49f55eee.tar.gz upstream-5fde931d6071225e4383b33aaaa2131d49f55eee.tar.bz2 upstream-5fde931d6071225e4383b33aaaa2131d49f55eee.zip |
kernel: bump 4.9 to 4.9.124
Refreshed all patches.
Compile-tested on: ar71xx
Runtime-tested on: ar71xx
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 08d730ac31..0bf9339d11 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; -@@ -3260,6 +3262,7 @@ static int packet_create(struct net *net +@@ -3262,6 +3264,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; -@@ -3873,6 +3876,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3875,6 +3878,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; } -@@ -3925,6 +3938,13 @@ static int packet_getsockopt(struct sock +@@ -3927,6 +3940,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; |