diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2017-03-26 12:22:27 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2017-03-26 12:23:19 +0200 |
commit | fb7ea71c15d2bccb8cc6383d3a08921b79713712 (patch) | |
tree | 402344f7b2dc8600fb8b8d1ae60eb05f1e3458a8 /target/linux/generic/patches-4.9/630-packet_socket_type.patch | |
parent | 88b125e9a46dd8793aa5eaef8c148e851ceb7463 (diff) | |
download | upstream-fb7ea71c15d2bccb8cc6383d3a08921b79713712.tar.gz upstream-fb7ea71c15d2bccb8cc6383d3a08921b79713712.tar.bz2 upstream-fb7ea71c15d2bccb8cc6383d3a08921b79713712.zip |
kernel: update kernel 4.9 to 4.9.17
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/patches-4.9/630-packet_socket_type.patch')
-rw-r--r-- | target/linux/generic/patches-4.9/630-packet_socket_type.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-4.9/630-packet_socket_type.patch b/target/linux/generic/patches-4.9/630-packet_socket_type.patch index ebfcb2bd31..4f093e4c5d 100644 --- a/target/linux/generic/patches-4.9/630-packet_socket_type.patch +++ b/target/linux/generic/patches-4.9/630-packet_socket_type.patch @@ -83,7 +83,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -3230,6 +3232,7 @@ static int packet_create(struct net *net +@@ -3234,6 +3236,7 @@ static int packet_create(struct net *net mutex_init(&po->pg_vec_lock); po->rollover = NULL; po->prot_hook.func = packet_rcv; @@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (sock->type == SOCK_PACKET) po->prot_hook.func = packet_rcv_spkt; -@@ -3809,6 +3812,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3813,6 +3816,16 @@ packet_setsockopt(struct socket *sock, i po->xmit = val ? packet_direct_xmit : dev_queue_xmit; return 0; } @@ -108,7 +108,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> default: return -ENOPROTOOPT; } -@@ -3861,6 +3874,13 @@ static int packet_getsockopt(struct sock +@@ -3865,6 +3878,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; |