aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-04-30 14:11:39 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-04-30 14:11:39 +0000
commit270e4ea27bc4c9d318be750a81ef5b4cb5dfdea0 (patch)
tree4e73287d2c16e5743d1bd4420e1e25b46764f7ff /target
parenta036aca55c12e243dc39313c60eeb702a639ea56 (diff)
downloadupstream-270e4ea27bc4c9d318be750a81ef5b4cb5dfdea0.tar.gz
upstream-270e4ea27bc4c9d318be750a81ef5b4cb5dfdea0.tar.bz2
upstream-270e4ea27bc4c9d318be750a81ef5b4cb5dfdea0.zip
refresh the packet socket patch for 2.6.29
SVN-Revision: 15511
Diffstat (limited to 'target')
-rw-r--r--target/linux/generic-2.6/patches-2.6.29/240-packet_socket_type.patch6
1 files changed, 3 insertions, 3 deletions
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 720d3201f3..e2840ea6b9 100644
--- 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,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
if (dev_net(dev) != sock_net(sk))
goto drop;
-@@ -1072,6 +1075,7 @@ static int packet_create(struct net *net
+@@ -1073,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;
@@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
if (sock->type == SOCK_PACKET)
po->prot_hook.func = packet_rcv_spkt;
-@@ -1411,6 +1415,16 @@ packet_setsockopt(struct socket *sock, i
+@@ -1413,6 +1417,16 @@ packet_setsockopt(struct socket *sock, i
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:
-@@ -1542,6 +1556,13 @@ static int packet_getsockopt(struct sock
+@@ -1544,6 +1558,13 @@ static int packet_getsockopt(struct sock
data = &val;
break;