From: Jan Engelhardt Date: Wed, 7 Oct 2009 21:59:05 +0000 (+0200) Subject: pknock: reduce indent in remove_rule X-Git-Tag: v1.19~2^2~21 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=370f47b0006bad8a91c2ea1d84ea07c2bca6c76b;p=thirdparty%2Fxtables-addons.git pknock: reduce indent in remove_rule --- diff --git a/extensions/xt_pknock.c b/extensions/xt_pknock.c index 394a45e..7e50162 100644 --- a/extensions/xt_pknock.c +++ b/extensions/xt_pknock.c @@ -504,27 +504,28 @@ remove_rule(struct xt_pknock_mtinfo *info) pr_debug("(N) rule not found: %s.\n", info->rule_name); return; } - if (rule != NULL && rule->ref_count == 0) { - hashtable_for_each_safe(pos, n, rule->peer_head, peer_hashsize, i) { - peer = list_entry(pos, struct peer, head); - - if (peer != NULL) { - pk_debug("DELETED", peer); - list_del(pos); - kfree(peer); - } - } + if (rule == NULL || rule->ref_count != 0) + return; - if (rule->status_proc != NULL) - remove_proc_entry(info->rule_name, pde); - pr_debug("(D) rule deleted: %s.\n", rule->rule_name); - if (timer_pending(&rule->timer)) - del_timer(&rule->timer); + hashtable_for_each_safe(pos, n, rule->peer_head, peer_hashsize, i) { + peer = list_entry(pos, struct peer, head); - list_del(&rule->head); - kfree(rule->peer_head); - kfree(rule); + if (peer != NULL) { + pk_debug("DELETED", peer); + list_del(pos); + kfree(peer); + } } + + if (rule->status_proc != NULL) + remove_proc_entry(info->rule_name, pde); + pr_debug("(D) rule deleted: %s.\n", rule->rule_name); + if (timer_pending(&rule->timer)) + del_timer(&rule->timer); + + list_del(&rule->head); + kfree(rule->peer_head); + kfree(rule); } /**