diff options
| author | David S. Miller <davem@davemloft.net> | 2017-09-05 23:03:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-09-05 23:03:35 -0400 |
| commit | 18fb0b46d555dc42f52f69428dcd52f133877078 (patch) | |
| tree | 7696741f50fb1a373aee3601074e30f6e366e425 /net/ieee802154 | |
| parent | 39cebdb77d55a193492a42170bf1c3d11e41e740 (diff) | |
| parent | 6d9c153a0b84392406bc77600aa7d3ea365de041 (diff) | |
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) | |||
| 580 | { | 580 | { |
| 581 | struct netns_ieee802154_lowpan *ieee802154_lowpan = | 581 | struct netns_ieee802154_lowpan *ieee802154_lowpan = |
| 582 | net_ieee802154_lowpan(net); | 582 | net_ieee802154_lowpan(net); |
| 583 | int res; | ||
| 584 | 583 | ||
| 585 | ieee802154_lowpan->frags.high_thresh = IPV6_FRAG_HIGH_THRESH; | 584 | ieee802154_lowpan->frags.high_thresh = IPV6_FRAG_HIGH_THRESH; |
| 586 | ieee802154_lowpan->frags.low_thresh = IPV6_FRAG_LOW_THRESH; | 585 | ieee802154_lowpan->frags.low_thresh = IPV6_FRAG_LOW_THRESH; |
| 587 | ieee802154_lowpan->frags.timeout = IPV6_FRAG_TIMEOUT; | 586 | ieee802154_lowpan->frags.timeout = IPV6_FRAG_TIMEOUT; |
| 588 | 587 | ||
| 589 | res = inet_frags_init_net(&ieee802154_lowpan->frags); | 588 | inet_frags_init_net(&ieee802154_lowpan->frags); |
| 590 | if (res) | 589 | |
| 591 | return res; | 590 | return lowpan_frags_ns_sysctl_register(net); |
| 592 | res = lowpan_frags_ns_sysctl_register(net); | ||
| 593 | if (res) | ||
| 594 | inet_frags_uninit_net(&ieee802154_lowpan->frags); | ||
| 595 | return res; | ||
| 596 | } | 591 | } |
| 597 | 592 | ||
| 598 | static void __net_exit lowpan_frags_exit_net(struct net *net) | 593 | static void __net_exit lowpan_frags_exit_net(struct net *net) |