From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 28 Apr 2009 19:16:24 +0000 (+0000)
Subject: fix a small bug in the socket type patch which broke dhcp
X-Git-Tag: reboot~23823
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=342a0e766022b18ef50178c9f23436180149d452;p=oweals%2Fopenwrt.git

fix a small bug in the socket type patch which broke dhcp

SVN-Revision: 15471
---

diff --git a/target/linux/generic-2.6/patches-2.6.28/240-packet_socket_type.patch b/target/linux/generic-2.6/patches-2.6.28/240-packet_socket_type.patch
index 710b7c06ab..720d3201f3 100644
--- a/target/linux/generic-2.6/patches-2.6.28/240-packet_socket_type.patch
+++ b/target/linux/generic-2.6/patches-2.6.28/240-packet_socket_type.patch
@@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
  	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;
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 710b7c06ab..720d3201f3 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
@@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
  	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;
diff --git a/target/linux/generic-2.6/patches-2.6.30/240-packet_socket_type.patch b/target/linux/generic-2.6/patches-2.6.30/240-packet_socket_type.patch
index b5af22597b..d86fcf3bc2 100644
--- a/target/linux/generic-2.6/patches-2.6.30/240-packet_socket_type.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/240-packet_socket_type.patch
@@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
  /* These ones are invisible by user level */
  #define PACKET_LOOPBACK		5		/* MC/BRD frame looped back */
  #define PACKET_FASTROUTE	6		/* Fastrouted frame	*/
-+#define PACKET_ANY		0xffffffff
++#define PACKET_MASK_ANY		0xffffffff	/* mask for packet type bits */
 +
  
  /* Packet socket options */
@@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
  	unsigned int		tp_hdrlen;
  	unsigned int		tp_reserve;
  #endif
-+	int			pkt_type;
++	unsigned int		pkt_type;
  };
  
  struct packet_skb_cb {
@@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
  	spin_lock_init(&po->bind_lock);
  	mutex_init(&po->pg_vec_lock);
  	po->prot_hook.func = packet_rcv;
-+	po->pkt_type = PACKET_ANY & ~PACKET_LOOPBACK;
++	po->pkt_type = PACKET_MASK_ANY & ~(1 << PACKET_LOOPBACK);
  
  	if (sock->type == SOCK_PACKET)
  		po->prot_hook.func = packet_rcv_spkt;
@@ -105,7 +105,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
  	}
 +	case PACKET_RECV_TYPE:
 +	{
-+		int val;
++		unsigned int val;
 +		if (optlen != sizeof(val))
 +			return -EINVAL;
 +		if (copy_from_user(&val, optval, sizeof(val)))
@@ -121,8 +121,8 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
  		data = &val;
  		break;
 +	case PACKET_RECV_TYPE:
-+		if (len > sizeof(int))
-+			len = sizeof(int);
++		if (len > sizeof(unsigned int))
++			len = sizeof(unsigned int);
 +		val = po->pkt_type;
 +
 +		data = &val;