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 4.9 to 4.9.12
[openwrt/staging/yousong.git]
/
target
/
linux
/
generic
/
patches-4.9
/
630-packet_socket_type.patch
diff --git
a/target/linux/generic/patches-4.9/630-packet_socket_type.patch
b/target/linux/generic/patches-4.9/630-packet_socket_type.patch
index ad2bc356aab8a663683d5d338c77f80997bf6b9f..b40a2d32eb3b7e4b61df24835c635239c467ca03 100644
(file)
--- a/
target/linux/generic/patches-4.9/630-packet_socket_type.patch
+++ b/
target/linux/generic/patches-4.9/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;
-@@ -321
0,6 +3212
,7 @@ static int packet_create(struct net *net
+@@ -321
1,6 +3213
,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;
-@@ -37
89,6 +3792
,16 @@ packet_setsockopt(struct socket *sock, i
+@@ -37
90,6 +3793
,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;
}
-@@ -384
1,6 +3854
,13 @@ static int packet_getsockopt(struct sock
+@@ -384
2,6 +3855
,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;