svn commit: r189896 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb netinet6

[Robert Watson]

Author: rwatson
Date: Mon Mar 16 18:05:31 2009
New Revision: 189896
URL: http://svn.freebsd.org/changeset/base/189896

Log:
  Merge r188963 from head to stable/7:
  
    Assert the radix head lock in in6_rtqkill().

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/netinet6/in6_rmx.c

Modified: stable/7/sys/netinet6/in6_rmx.c
==============================================================================
--- stable/7/sys/netinet6/in6_rmx.c	Mon Mar 16 18:02:00 2009	(r189895)
+++ stable/7/sys/netinet6/in6_rmx.c	Mon Mar 16 18:05:31 2009	(r189896)
@@ -289,6 +289,8 @@ in6_rtqkill(struct radix_node *rn, void 
 	struct rtentry *rt = (struct rtentry *)rn;
 	int err;
 
+	RADIX_NODE_HEAD_LOCK_ASSERT(ap->rnh);
+
 	if (rt->rt_flags & RTPRF_OURS) {
 		ap->found++;