diff options
| author | Gleb Smirnoff <glebius@FreeBSD.org> | 2014-02-08 09:56:26 +0000 |
|---|---|---|
| committer | Gleb Smirnoff <glebius@FreeBSD.org> | 2014-02-08 09:56:26 +0000 |
| commit | 603819bc74a6b69d7dccc8c5a32900f2085028d7 (patch) | |
| tree | e0704318771b0f06e2ebc23ce3e3ceb075f9f878 /sys | |
| parent | bf73979dd9071cbcbc9db78cc83ca4343b03b06e (diff) | |
| download | src-603819bc74a6b69d7dccc8c5a32900f2085028d7.tar.gz src-603819bc74a6b69d7dccc8c5a32900f2085028d7.zip | |
Remove never set flag FL_OVERWRITE. The only place where
it was checked led to lock/critnest leak.
Notes
Notes:
svn path=/head/; revision=261627
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/net/flowtable.c | 3 | ||||
| -rw-r--r-- | sys/net/pfvar.h | 4 |
2 files changed, 0 insertions, 7 deletions
diff --git a/sys/net/flowtable.c b/sys/net/flowtable.c index 9be23ffb68bd..e03c9a063cb7 100644 --- a/sys/net/flowtable.c +++ b/sys/net/flowtable.c @@ -280,7 +280,6 @@ flowtable_pcpu_unlock(struct flowtable *table, uint32_t hash) #define FL_ENTRY_UNLOCK(table, hash) (table)->ft_unlock((table), (hash)) #define FL_STALE (1<<8) -#define FL_OVERWRITE (1<<10) static struct flentry *flowtable_lookup_common(struct flowtable *, struct sockaddr_storage *, struct sockaddr_storage *, struct mbuf *, int); @@ -833,8 +832,6 @@ flowtable_insert(struct flowtable *ft, uint32_t hash, uint32_t *key, FL_ENTRY_UNLOCK(ft, hash); uma_zfree(ft->ft_zone, newfle); - if (flags & FL_OVERWRITE) - goto skip; return (EEXIST); } /* diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 28b313e26f65..6d3e4761ad50 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1580,8 +1580,6 @@ extern struct pf_src_node *pf_find_src_node(struct pf_addr *, extern void pf_unlink_src_node(struct pf_src_node *); extern void pf_unlink_src_node_locked(struct pf_src_node *); extern u_int pf_free_src_nodes(struct pf_src_node_list *); -extern void pf_print_state(struct pf_state *); -extern void pf_print_flags(u_int8_t); extern u_int16_t pf_cksum_fixup(u_int16_t, u_int16_t, u_int16_t, u_int8_t); @@ -1744,8 +1742,6 @@ int pf_osfp_get(struct pf_osfp_ioctl *); int pf_osfp_match(struct pf_osfp_enlist *, pf_osfp_t); #ifdef _KERNEL -void pf_print_host(struct pf_addr *, u_int16_t, u_int8_t); - void pf_step_into_anchor(struct pf_anchor_stackframe *, int *, struct pf_ruleset **, int, struct pf_rule **, struct pf_rule **, int *); |