svn commit: r273184 - stable/10/sys/netpfil/pf

[Gleb Smirnoff]

Author: glebius
Date: Thu Oct 16 20:43:12 2014
New Revision: 273184
URL: https://svnweb.freebsd.org/changeset/base/273184

Log:
  Merge r272358 from head:
    Use rn_detachhead() instead of direct free(9) for radix tables.

Modified:
  stable/10/sys/netpfil/pf/pf_table.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/netpfil/pf/pf_table.c
==============================================================================
--- stable/10/sys/netpfil/pf/pf_table.c	Thu Oct 16 20:33:04 2014	(r273183)
+++ stable/10/sys/netpfil/pf/pf_table.c	Thu Oct 16 20:43:12 2014	(r273184)
@@ -1854,11 +1854,11 @@ pfr_destroy_ktable(struct pfr_ktable *kt
 	}
 	if (kt->pfrkt_ip4 != NULL) {
 		RADIX_NODE_HEAD_DESTROY(kt->pfrkt_ip4);
-		free((caddr_t)kt->pfrkt_ip4, M_RTABLE);
+		rn_detachhead((void **)&kt->pfrkt_ip4);
 	}
 	if (kt->pfrkt_ip6 != NULL) {
 		RADIX_NODE_HEAD_DESTROY(kt->pfrkt_ip6);
-		free((caddr_t)kt->pfrkt_ip6, M_RTABLE);
+		rn_detachhead((void **)&kt->pfrkt_ip6);
 	}
 	if (kt->pfrkt_shadow != NULL)
 		pfr_destroy_ktable(kt->pfrkt_shadow, flushaddr);