projects
/
openwrt-github
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: bump 3.18 to 3.18.39
[openwrt-github/.git]
/
target
/
linux
/
generic
/
patches-3.18
/
630-packet_socket_type.patch
diff --git
a/target/linux/generic/patches-3.18/630-packet_socket_type.patch
b/target/linux/generic/patches-3.18/630-packet_socket_type.patch
index 7502a1c3b4ade4dff98d069eb925f9b1bef8acb0..61ddea84c6893acd2719cbae696687361c96aa53 100644
(file)
--- a/
target/linux/generic/patches-3.18/630-packet_socket_type.patch
+++ b/
target/linux/generic/patches-3.18/630-packet_socket_type.patch
@@
-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;
-@@ -340
8,6 +3411
,16 @@ packet_setsockopt(struct socket *sock, i
+@@ -340
9,6 +3412
,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;
}
-@@ -34
59,6 +3472
,13 @@ static int packet_getsockopt(struct sock
+@@ -34
60,6 +3473
,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;