svn commit: r205415 - head/sys/netinet/ipfw
Luigi Rizzo
luigi at FreeBSD.org
Sun Mar 21 15:54:07 UTC 2010
Author: luigi
Date: Sun Mar 21 15:54:07 2010
New Revision: 205415
URL: http://svn.freebsd.org/changeset/base/205415
Log:
no need for ipfw_flush_tables(), we just need ipfw_destroy_tables()
Modified:
head/sys/netinet/ipfw/ip_fw_private.h
head/sys/netinet/ipfw/ip_fw_table.c
Modified: head/sys/netinet/ipfw/ip_fw_private.h
==============================================================================
--- head/sys/netinet/ipfw/ip_fw_private.h Sun Mar 21 15:52:55 2010 (r205414)
+++ head/sys/netinet/ipfw/ip_fw_private.h Sun Mar 21 15:54:07 2010 (r205415)
@@ -274,7 +274,6 @@ int ipfw_lookup_table(struct ip_fw_chain
int ipfw_init_tables(struct ip_fw_chain *ch);
void ipfw_destroy_tables(struct ip_fw_chain *ch);
int ipfw_flush_table(struct ip_fw_chain *ch, uint16_t tbl);
-void ipfw_flush_tables(struct ip_fw_chain *ch);
int ipfw_add_table_entry(struct ip_fw_chain *ch, uint16_t tbl, in_addr_t addr,
uint8_t mlen, uint32_t value);
int ipfw_dump_table_entry(struct radix_node *rn, void *arg);
Modified: head/sys/netinet/ipfw/ip_fw_table.c
==============================================================================
--- head/sys/netinet/ipfw/ip_fw_table.c Sun Mar 21 15:52:55 2010 (r205414)
+++ head/sys/netinet/ipfw/ip_fw_table.c Sun Mar 21 15:54:07 2010 (r205415)
@@ -176,14 +176,18 @@ ipfw_flush_table(struct ip_fw_chain *ch,
}
void
-ipfw_flush_tables(struct ip_fw_chain *ch)
+ipfw_destroy_tables(struct ip_fw_chain *ch)
{
uint16_t tbl;
+ struct radix_node_head *rnh;
IPFW_WLOCK_ASSERT(ch);
- for (tbl = 0; tbl < IPFW_TABLES_MAX; tbl++)
+ for (tbl = 0; tbl < IPFW_TABLES_MAX; tbl++) {
ipfw_flush_table(ch, tbl);
+ rnh = ch->tables[tbl];
+ rn_detachhead((void **)&rnh);
+ }
}
int
@@ -203,21 +207,6 @@ ipfw_init_tables(struct ip_fw_chain *ch)
return (0);
}
-void
-ipfw_destroy_tables(struct ip_fw_chain *ch)
-{
- int tbl;
- struct radix_node_head *rnh;
-
- IPFW_WLOCK_ASSERT(ch);
-
- ipfw_flush_tables(ch);
- for (tbl = 0; tbl < IPFW_TABLES_MAX; tbl++) {
- rnh = ch->tables[tbl];
- rn_detachhead((void **)&rnh);
- }
-}
-
int
ipfw_lookup_table(struct ip_fw_chain *ch, uint16_t tbl, in_addr_t addr,
uint32_t *val)
More information about the svn-src-head
mailing list