projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[cavium-octeon] update to 2.6.30-rc5
[openwrt.git]
/
target
/
linux
/
generic-2.6
/
patches-2.6.29
/
240-packet_socket_type.patch
diff --git
a/target/linux/generic-2.6/patches-2.6.29/240-packet_socket_type.patch
b/target/linux/generic-2.6/patches-2.6.29/240-packet_socket_type.patch
index
710b7c0
..
e2840ea
100644
(file)
--- a/
target/linux/generic-2.6/patches-2.6.29/240-packet_socket_type.patch
+++ b/
target/linux/generic-2.6/patches-2.6.29/240-packet_socket_type.patch
@@
-91,15
+91,15
@@
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
if (dev_net(dev) != sock_net(sk))
goto drop;
if (dev_net(dev) != sock_net(sk))
goto drop;
-@@ -107
2,6 +1075
,7 @@ static int packet_create(struct net *net
+@@ -107
3,6 +1076
,7 @@ static int packet_create(struct net *net
spin_lock_init(&po->bind_lock);
mutex_init(&po->pg_vec_lock);
po->prot_hook.func = packet_rcv;
spin_lock_init(&po->bind_lock);
mutex_init(&po->pg_vec_lock);
po->prot_hook.func = packet_rcv;
-+ po->pkt_type = PACKET_MASK_ANY & ~
PACKET_LOOPBACK
;
++ po->pkt_type = PACKET_MASK_ANY & ~
(1 << PACKET_LOOPBACK)
;
if (sock->type == SOCK_PACKET)
po->prot_hook.func = packet_rcv_spkt;
if (sock->type == SOCK_PACKET)
po->prot_hook.func = packet_rcv_spkt;
-@@ -141
1,6 +1415
,16 @@ packet_setsockopt(struct socket *sock, i
+@@ -141
3,6 +1417
,16 @@ packet_setsockopt(struct socket *sock, i
ret = packet_mc_drop(sk, &mreq);
return ret;
}
ret = packet_mc_drop(sk, &mreq);
return ret;
}
@@
-116,7
+116,7
@@
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
#ifdef CONFIG_PACKET_MMAP
case PACKET_RX_RING:
#ifdef CONFIG_PACKET_MMAP
case PACKET_RX_RING:
-@@ -154
2,6 +1556
,13 @@ static int packet_getsockopt(struct sock
+@@ -154
4,6 +1558
,13 @@ static int packet_getsockopt(struct sock
data = &val;
break;
data = &val;
break;
This page took
0.025755 seconds
and
4
git commands to generate.