diff options
| author | luigi <luigi@FreeBSD.org> | 2010-02-17 13:06:06 +0000 |
|---|---|---|
| committer | luigi <luigi@FreeBSD.org> | 2010-02-17 13:06:06 +0000 |
| commit | c2328f70d5903c68cb6f599a0a869e93a003a3d2 (patch) | |
| tree | c83ec4c4cdf9b055afcd905686b8907d74ca349d /sys/netinet | |
| parent | 41471022dccbc47ade8bd73eb015bcf9337ce3a3 (diff) | |
| download | FreeBSD-src-c2328f70d5903c68cb6f599a0a869e93a003a3d2.zip FreeBSD-src-c2328f70d5903c68cb6f599a0a869e93a003a3d2.tar.gz | |
remove recursive lock/unlock calls, we do them already before entering
the switch.
Reported by: Marta Carbone
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/ipfw/ip_fw_sockopt.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sys/netinet/ipfw/ip_fw_sockopt.c b/sys/netinet/ipfw/ip_fw_sockopt.c index 596324d..3d0fc55 100644 --- a/sys/netinet/ipfw/ip_fw_sockopt.c +++ b/sys/netinet/ipfw/ip_fw_sockopt.c @@ -343,27 +343,22 @@ del_entry(struct ip_fw_chain *chain, u_int32_t arg) break; case 2: /* move rules with given number to new set */ - IPFW_UH_WLOCK(chain); for (i = 0; i < chain->n_rules; i++) { rule = chain->map[i]; if (rule->rulenum == rulenum) rule->set = new_set; } - IPFW_UH_WUNLOCK(chain); break; case 3: /* move rules with given set number to new set */ - IPFW_UH_WLOCK(chain); for (i = 0; i < chain->n_rules; i++) { rule = chain->map[i]; if (rule->set == rulenum) rule->set = new_set; } - IPFW_UH_WUNLOCK(chain); break; case 4: /* swap two sets */ - IPFW_UH_WLOCK(chain); for (i = 0; i < chain->n_rules; i++) { rule = chain->map[i]; if (rule->set == rulenum) @@ -371,7 +366,6 @@ del_entry(struct ip_fw_chain *chain, u_int32_t arg) else if (rule->set == new_set) rule->set = rulenum; } - IPFW_UH_WUNLOCK(chain); break; } rule = chain->reap; |
