svn commit: r186363 - in stable/7/sys: . contrib/pf dev/cxgb netinet

Christian S.J. Peron csjp at FreeBSD.org
Sat Dec 20 19:39:10 UTC 2008


Author: csjp
Date: Sat Dec 20 19:39:09 2008
New Revision: 186363
URL: http://svn.freebsd.org/changeset/base/186363

Log:
  MFC revision 185713 from head.
  
  Make sure we are maintaining the reference count on the route eliminating
  another:
  
  rtfree: 0xc841ee88 has 1 refs
  
  Reviewed by:	bz
  Approved by:	re@ (gnn)

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/netinet/if_ether.c

Modified: stable/7/sys/netinet/if_ether.c
==============================================================================
--- stable/7/sys/netinet/if_ether.c	Sat Dec 20 17:55:37 2008	(r186362)
+++ stable/7/sys/netinet/if_ether.c	Sat Dec 20 19:39:09 2008	(r186363)
@@ -909,12 +909,12 @@ reply:
 			 * over who claims what Ether address.
 			 */
 			if (rt->rt_ifp == ifp) {
-				rtfree(rt);
+				RTFREE_LOCKED(rt);
 				goto drop;
 			}
 			(void)memcpy(ar_tha(ah), ar_sha(ah), ah->ar_hln);
 			(void)memcpy(ar_sha(ah), enaddr, ah->ar_hln);
-			rtfree(rt);
+			RTFREE_LOCKED(rt);
 
 			/*
 			 * Also check that the node which sent the ARP packet
@@ -933,10 +933,10 @@ reply:
 				    " from %s via %s, expecting %s\n",
 				    inet_ntoa(isaddr), ifp->if_xname,
 				    rt->rt_ifp->if_xname);
-				rtfree(rt);
+				RTFREE_LOCKED(rt);
 				goto drop;
 			}
-			rtfree(rt);
+			RTFREE_LOCKED(rt);
 
 #ifdef DEBUG_PROXY
 			printf("arp: proxying for %s\n",


More information about the svn-src-all mailing list