aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-4.4/630-packet_socket_type.patch
diff options
context:
space:
mode:
authorKevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>2017-02-19 10:48:39 +0000
committerJo-Philipp Wich <jo@mein.io>2017-02-23 10:40:21 +0100
commit91a65f6c88aaf3155409f10ff6e8d55386ab13a0 (patch)
tree0e909d6f59e2588c7a3750f76da68013bc70a16f /target/linux/generic/patches-4.4/630-packet_socket_type.patch
parent9e4555f58dd2879bc5ddd43822cbc556bbb2e39c (diff)
downloadupstream-91a65f6c88aaf3155409f10ff6e8d55386ab13a0.tar.gz
upstream-91a65f6c88aaf3155409f10ff6e8d55386ab13a0.tar.bz2
upstream-91a65f6c88aaf3155409f10ff6e8d55386ab13a0.zip
kernel: update kernel 4.4 to 4.4.50
Bump kernel from 4.4.49 to 4.4.50 Compile tested: All targets Run tested: ar71xx Archer C7 v2 Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
Diffstat (limited to 'target/linux/generic/patches-4.4/630-packet_socket_type.patch')
-rw-r--r--target/linux/generic/patches-4.4/630-packet_socket_type.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-4.4/630-packet_socket_type.patch b/target/linux/generic/patches-4.4/630-packet_socket_type.patch
index eb79b2dd37..71ff0eb6cf 100644
--- a/target/linux/generic/patches-4.4/630-packet_socket_type.patch
+++ b/target/linux/generic/patches-4.4/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;
-@@ -3091,6 +3093,7 @@ static int packet_create(struct net *net
+@@ -3092,6 +3094,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;
-@@ -3713,6 +3716,16 @@ packet_setsockopt(struct socket *sock, i
+@@ -3714,6 +3717,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;
}
-@@ -3765,6 +3778,13 @@ static int packet_getsockopt(struct sock
+@@ -3766,6 +3779,13 @@ static int packet_getsockopt(struct sock
case PACKET_VNET_HDR:
val = po->has_vnet_hdr;
break;