projects
/
openwrt
/
staging
/
yousong.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: update kernel 4.4 to 4.4.50
[openwrt/staging/yousong.git]
/
target
/
linux
/
generic
/
patches-4.4
/
630-packet_socket_type.patch
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 eb79b2dd37569bdee0c589439dfb1319f3602358..71ff0eb6cf929a6a818f0aebbce40052419992d7 100644
(file)
--- 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;
if (!net_eq(dev_net(dev), sock_net(sk)))
goto drop;
-@@ -309
1,6 +3093
,7 @@ static int packet_create(struct net *net
+@@ -309
2,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;
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;
if (sock->type == SOCK_PACKET)
po->prot_hook.func = packet_rcv_spkt;
-@@ -371
3,6 +3716
,16 @@ packet_setsockopt(struct socket *sock, i
+@@ -371
4,6 +3717
,16 @@ packet_setsockopt(struct socket *sock, i
po->xmit = val ? packet_direct_xmit : dev_queue_xmit;
return 0;
}
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;
}
default:
return -ENOPROTOOPT;
}
-@@ -376
5,6 +3778
,13 @@ static int packet_getsockopt(struct sock
+@@ -376
6,6 +3779
,13 @@ static int packet_getsockopt(struct sock
case PACKET_VNET_HDR:
val = po->has_vnet_hdr;
break;
case PACKET_VNET_HDR:
val = po->has_vnet_hdr;
break;