From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 30 Apr 2009 14:11:39 +0000 (+0000)
Subject: refresh the packet socket patch for 2.6.29
X-Git-Tag: reboot~23793
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=270e4ea27bc4c9d318be750a81ef5b4cb5dfdea0;p=openwrt%2Fstaging%2Flynxis.git

refresh the packet socket patch for 2.6.29

SVN-Revision: 15511
---

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;