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>2018-08-30 12:47:44 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2018-08-30 13:07:40 +0200
commitf712db9df6320b296849378030a66372255ffca2 (patch)
treecc259f54ec6ca0973f17478cb7fcdca8268e730f /target/linux/generic/patches-4.4/630-packet_socket_type.patch
parent55840040dfcce33ca6a00da53f0345bd7e227cff (diff)
downloadupstream-f712db9df6320b296849378030a66372255ffca2.tar.gz
upstream-f712db9df6320b296849378030a66372255ffca2.tar.bz2
upstream-f712db9df6320b296849378030a66372255ffca2.zip
kernel: bump kernel 4.4 to version 4.4.153
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 dcd9928e7a..359b151020 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;
-@@ -3137,6 +3139,7 @@ static int packet_create(struct net *net
+@@ -3139,6 +3141,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;
-@@ -3795,6 +3798,16 @@ packet_setsockopt(struct socket *sock, i
+@@ -3797,6 +3800,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;
}
-@@ -3847,6 +3860,13 @@ static int packet_getsockopt(struct sock
+@@ -3849,6 +3862,13 @@ static int packet_getsockopt(struct sock
case PACKET_VNET_HDR:
val = po->has_vnet_hdr;
break;