From 49040ef0bc5820d4a7abe9baca8ff1923884c4fa Mon Sep 17 00:00:00 2001 From: Vicente Date: Mon, 10 Jun 2013 15:28:47 +0200 Subject: [PATCH] NETFILTER: remove unnecessary goto statement for error recovery --- .../linux/linux-2.6/net/ipv4/netfilter/iptable_filter.c | 11 ++++------- .../linux/linux-2.6/net/ipv4/netfilter/iptable_mangle.c | 8 ++------ .../src-rt/linux/linux-2.6/net/ipv4/netfilter/iptable_raw.c | 9 +++------ 3 files changed, 9 insertions(+), 19 deletions(-) diff --git a/release/src-rt/linux/linux-2.6/net/ipv4/netfilter/iptable_filter.c b/release/src-rt/linux/linux-2.6/net/ipv4/netfilter/iptable_filter.c index a7494cc72d..caa00becbd 100644 --- a/release/src-rt/linux/linux-2.6/net/ipv4/netfilter/iptable_filter.c +++ b/release/src-rt/linux/linux-2.6/net/ipv4/netfilter/iptable_filter.c @@ -135,13 +135,10 @@ static int __init iptable_filter_init(void) /* Register hooks */ ret = nf_register_hooks(ipt_ops, ARRAY_SIZE(ipt_ops)); - if (ret < 0) - goto cleanup_table; - - return ret; - - cleanup_table: - ipt_unregister_table(&packet_filter); + if (ret < 0) { + ipt_unregister_table(&packet_filter); + } + return ret; } diff --git a/release/src-rt/linux/linux-2.6/net/ipv4/netfilter/iptable_mangle.c b/release/src-rt/linux/linux-2.6/net/ipv4/netfilter/iptable_mangle.c index e73d18ed71..ce7b6bac71 100644 --- a/release/src-rt/linux/linux-2.6/net/ipv4/netfilter/iptable_mangle.c +++ b/release/src-rt/linux/linux-2.6/net/ipv4/netfilter/iptable_mangle.c @@ -176,13 +176,9 @@ static int __init iptable_mangle_init(void) /* Register hooks */ ret = nf_register_hooks(ipt_ops, ARRAY_SIZE(ipt_ops)); - if (ret < 0) - goto cleanup_table; - - return ret; - - cleanup_table: + if (ret < 0) { ipt_unregister_table(&packet_mangler); + } return ret; } diff --git a/release/src-rt/linux/linux-2.6/net/ipv4/netfilter/iptable_raw.c b/release/src-rt/linux/linux-2.6/net/ipv4/netfilter/iptable_raw.c index 6f7fc4b361..9aca5badcb 100644 --- a/release/src-rt/linux/linux-2.6/net/ipv4/netfilter/iptable_raw.c +++ b/release/src-rt/linux/linux-2.6/net/ipv4/netfilter/iptable_raw.c @@ -101,13 +101,10 @@ static int __init iptable_raw_init(void) /* Register hooks */ ret = nf_register_hooks(ipt_ops, ARRAY_SIZE(ipt_ops)); - if (ret < 0) - goto cleanup_table; - - return ret; - - cleanup_table: + if (ret < 0) { ipt_unregister_table(&packet_raw); + } + return ret; } -- 2.11.4.GIT