diff options
| author | Luiz Souza <luiz@netgate.com> | 2017-07-16 11:10:57 -0500 |
|---|---|---|
| committer | Luiz Souza <luiz@netgate.com> | 2017-07-16 12:09:39 -0500 |
| commit | 7d6b749871612a5a14ab59cbb1c72527036d1f4e (patch) | |
| tree | d3e7e523a717b7d715b9998222aaa06a97d34399 | |
| parent | e1d7d4f6c8167b601dfec75902ed603d0b5ef347 (diff) | |
| download | FreeBSD-src-7d6b749871612a5a14ab59cbb1c72527036d1f4e.zip FreeBSD-src-7d6b749871612a5a14ab59cbb1c72527036d1f4e.tar.gz | |
Fix the ipfw_lookup_table() prototype and a mistake done in a last minute function rename.
(cherry picked from commit 2d8da6a834cc0fd44f1f98a7a5c5b9aabc48829c)
| -rw-r--r-- | sys/netpfil/ipfw/ip_fw_private.h | 2 | ||||
| -rw-r--r-- | sys/netpfil/ipfw/ip_fw_table.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/netpfil/ipfw/ip_fw_private.h b/sys/netpfil/ipfw/ip_fw_private.h index 394b45a..73523f5 100644 --- a/sys/netpfil/ipfw/ip_fw_private.h +++ b/sys/netpfil/ipfw/ip_fw_private.h @@ -738,7 +738,7 @@ typedef int (table_lookup_t)(struct table_info *ti, void *key, uint32_t keylen, uint32_t *val, void **te); int ipfw_lookup_table(struct ip_fw_chain *ch, uint16_t tbl, uint16_t plen, - void *paddr, uint32_t *val); + void *paddr, uint32_t *val, void **te); void ipfw_cnt_update_tentry(struct ip_fw_chain *ch, uint16_t tbl, uint16_t plen, void *e, int pktlen); struct named_object *ipfw_objhash_lookup_table_kidx(struct ip_fw_chain *ch, diff --git a/sys/netpfil/ipfw/ip_fw_table.c b/sys/netpfil/ipfw/ip_fw_table.c index ac269cd..8c9f777 100644 --- a/sys/netpfil/ipfw/ip_fw_table.c +++ b/sys/netpfil/ipfw/ip_fw_table.c @@ -1738,7 +1738,7 @@ ipfw_lookup_table(struct ip_fw_chain *ch, uint16_t tbl, uint16_t plen, * Update the table entry counter. */ void -ipfw_cnt_tentry_update(struct ip_fw_chain *ch, uint16_t tbl, uint16_t plen, +ipfw_cnt_update_tentry(struct ip_fw_chain *ch, uint16_t tbl, uint16_t plen, void *e, int pktlen) { struct namedobj_instance *ni; |
