aboutsummaryrefslogtreecommitdiffstats
path: root/net/ieee802154
diff options
context:
space:
mode:
authorAlexander Aring <alex.aring@gmail.com>2014-03-07 11:06:54 +0100
committerDavid S. Miller <davem@davemloft.net>2014-03-07 17:11:19 -0500
commit37147652cfaa20a87ead9bb04aec1834b40c5c97 (patch)
treea2fa74a0a64df5e52dae9c774771b5128a0a9b01 /net/ieee802154
parentMerge tag 'linux-can-next-for-3.15-20140307' of git://gitorious.org/linux-can/linux-can-next (diff)
downloadlinux-dev-37147652cfaa20a87ead9bb04aec1834b40c5c97.tar.xz
linux-dev-37147652cfaa20a87ead9bb04aec1834b40c5c97.zip
6lowpan: reassembly: fix return of init function
This patch adds a missing return after fragmentation init. Otherwise we register a sysctl interface and deregister it afterwards which makes no sense. Signed-off-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ieee802154')
-rw-r--r--net/ieee802154/reassembly.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ieee802154/reassembly.c b/net/ieee802154/reassembly.c
index 1cc2336eb52c..bf06492e7d19 100644
--- a/net/ieee802154/reassembly.c
+++ b/net/ieee802154/reassembly.c
@@ -535,7 +535,7 @@ int __init lowpan_net_frag_init(void)
ret = lowpan_frags_sysctl_register();
if (ret)
- goto out;
+ return ret;
ret = register_pernet_subsys(&lowpan_frags_ops);
if (ret)
@@ -550,9 +550,10 @@ int __init lowpan_net_frag_init(void)
lowpan_frags.frag_expire = lowpan_frag_expire;
lowpan_frags.secret_interval = 10 * 60 * HZ;
inet_frags_init(&lowpan_frags);
+
+ return ret;
err_pernet:
lowpan_frags_sysctl_unregister();
-out:
return ret;
}