svn commit: r255248 - in head/sys: netinet netinet6

[John Baldwin]

Author: jhb
Date: Thu Sep  5 14:16:37 2013
New Revision: 255248
URL: http://svnweb.freebsd.org/changeset/base/255248

Log:
  Use an unsigned long when indexing into mfchashtbl[] and mf6ctable[].  This
  matches the types used when computing hash indices and the type of the
  maximum size of mfchashtbl[].
  
  PR:		kern/181821
  Submitted by:	Sven-Thorsten Dietrich <sven at vyatta.com> (IPv4)
  MFC after:	1 week

Modified:
  head/sys/netinet/ip_mroute.c
  head/sys/netinet6/ip6_mroute.c

Modified: head/sys/netinet/ip_mroute.c
==============================================================================
--- head/sys/netinet/ip_mroute.c	Thu Sep  5 13:53:25 2013	(r255247)
+++ head/sys/netinet/ip_mroute.c	Thu Sep  5 14:16:37 2013	(r255248)
@@ -609,7 +609,7 @@ static void
 if_detached_event(void *arg __unused, struct ifnet *ifp)
 {
     vifi_t vifi;
-    int i;
+    u_long i;
 
     MROUTER_LOCK();
 
@@ -705,7 +705,7 @@ static int
 X_ip_mrouter_done(void)
 {
     struct ifnet *ifp;
-    int i;
+    u_long i;
     vifi_t vifi;
 
     MROUTER_LOCK();
@@ -797,7 +797,7 @@ set_assert(int i)
 int
 set_api_config(uint32_t *apival)
 {
-    int i;
+    u_long i;
 
     /*
      * We can set the API capabilities only if it is the first operation
@@ -1433,7 +1433,7 @@ non_fatal:
 static void
 expire_upcalls(void *arg)
 {
-    int i;
+    u_long i;
 
     CURVNET_SET((struct vnet *) arg);
 

Modified: head/sys/netinet6/ip6_mroute.c
==============================================================================
--- head/sys/netinet6/ip6_mroute.c	Thu Sep  5 13:53:25 2013	(r255247)
+++ head/sys/netinet6/ip6_mroute.c	Thu Sep  5 14:16:37 2013	(r255248)
@@ -576,7 +576,7 @@ int
 X_ip6_mrouter_done(void)
 {
 	mifi_t mifi;
-	int i;
+	u_long i;
 	struct mf6c *rt;
 	struct rtdetq *rte;
 
@@ -1341,7 +1341,7 @@ expire_upcalls(void *unused)
 {
 	struct rtdetq *rte;
 	struct mf6c *mfc, **nptr;
-	int i;
+	u_long i;
 
 	MFC6_LOCK();
 	for (i = 0; i < MF6CTBLSIZ; i++) {