diff options
| author | David S. Miller <davem@davemloft.net> | 2017-09-06 05:03:35 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-09-06 05:03:35 +0200 |
| commit | 18fb0b46d555dc42f52f69428dcd52f133877078 (patch) | |
| tree | 7696741f50fb1a373aee3601074e30f6e366e425 /net/ieee802154 | |
| parent | Merge branch 'xgene-Misc-bug-fixes' (diff) | |
| parent | net: dsa: loop: Do not unregister invalid fixed PHY (diff) | |
| download | linux-18fb0b46d555dc42f52f69428dcd52f133877078.tar.xz linux-18fb0b46d555dc42f52f69428dcd52f133877078.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/ieee802154')
| -rw-r--r-- | net/ieee802154/6lowpan/reassembly.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/net/ieee802154/6lowpan/reassembly.c b/net/ieee802154/6lowpan/reassembly.c index 30d875dff6b5..f85b08baff16 100644 --- a/net/ieee802154/6lowpan/reassembly.c +++ b/net/ieee802154/6lowpan/reassembly.c @@ -580,19 +580,14 @@ static int __net_init lowpan_frags_init_net(struct net *net) { struct netns_ieee802154_lowpan *ieee802154_lowpan = net_ieee802154_lowpan(net); - int res; ieee802154_lowpan->frags.high_thresh = IPV6_FRAG_HIGH_THRESH; ieee802154_lowpan->frags.low_thresh = IPV6_FRAG_LOW_THRESH; ieee802154_lowpan->frags.timeout = IPV6_FRAG_TIMEOUT; - res = inet_frags_init_net(&ieee802154_lowpan->frags); - if (res) - return res; - res = lowpan_frags_ns_sysctl_register(net); - if (res) - inet_frags_uninit_net(&ieee802154_lowpan->frags); - return res; + inet_frags_init_net(&ieee802154_lowpan->frags); + + return lowpan_frags_ns_sysctl_register(net); } static void __net_exit lowpan_frags_exit_net(struct net *net) |