summaryrefslogtreecommitdiff
path: root/target/linux/generic/patches-4.4/630-packet_socket_type.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2018-05-30 21:39:51 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2018-06-02 15:13:12 +0200
commit2328977fed81cf2fc367d8eea2f9bf04e51a761f (patch)
treeb6e2e89fcc861cf7fdba5e2979d7458ce912a348 /target/linux/generic/patches-4.4/630-packet_socket_type.patch
parent6e47c22268d5c89971950052aceda03810c88c75 (diff)
downloadmtk-20170518-2328977fed81cf2fc367d8eea2f9bf04e51a761f.zip
mtk-20170518-2328977fed81cf2fc367d8eea2f9bf04e51a761f.tar.gz
mtk-20170518-2328977fed81cf2fc367d8eea2f9bf04e51a761f.tar.bz2
kernel: bump kernel 4.4 to 4.4.135 for 17.01
* Refreshed patches 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 f3fe51f..dcd9928 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;
-@@ -3135,6 +3137,7 @@ static int packet_create(struct net *net
+@@ -3137,6 +3139,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;
-@@ -3793,6 +3796,16 @@ packet_setsockopt(struct socket *sock, i
+@@ -3795,6 +3798,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;
}
-@@ -3845,6 +3858,13 @@ static int packet_getsockopt(struct sock
+@@ -3847,6 +3860,13 @@ static int packet_getsockopt(struct sock
case PACKET_VNET_HDR:
val = po->has_vnet_hdr;
break;