| Message ID | 1394186814-18745-1-git-send-email-alex.aring@gmail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Alexander Aring <alex.aring@gmail.com> Date: Fri, 7 Mar 2014 11:06:54 +0100 > 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> > --- > Changes since v2: > - remove goto out label and use return ret instead. Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ieee802154/reassembly.c b/net/ieee802154/reassembly.c index 1cc2336..bf06492 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; }
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> --- Changes since v2: - remove goto out label and use return ret instead. net/ieee802154/reassembly.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)