aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-4.4/630-packet_socket_type.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2017-04-02 11:53:42 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2017-04-02 14:37:49 +0200
commit0dcc4d239da78bc20b091d50c097c386e0e61902 (patch)
tree47a71ebb1271cb26429c20e34dcad1f8e3d5e945 /target/linux/generic/patches-4.4/630-packet_socket_type.patch
parent1adc6db0362d2fdede68a3f1f3a5f119ca39d30a (diff)
downloadupstream-0dcc4d239da78bc20b091d50c097c386e0e61902.tar.gz
upstream-0dcc4d239da78bc20b091d50c097c386e0e61902.tar.bz2
upstream-0dcc4d239da78bc20b091d50c097c386e0e61902.zip
kernel: update kernel 4.4 to 4.4.59
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
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 0c248639ba..c334418ac1 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;
-@@ -3111,6 +3113,7 @@ static int packet_create(struct net *net
+@@ -3115,6 +3117,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;
-@@ -3733,6 +3736,16 @@ packet_setsockopt(struct socket *sock, i
+@@ -3737,6 +3740,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;
}
-@@ -3785,6 +3798,13 @@ static int packet_getsockopt(struct sock
+@@ -3789,6 +3802,13 @@ static int packet_getsockopt(struct sock
case PACKET_VNET_HDR:
val = po->has_vnet_hdr;
break;