diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-10-04 12:03:25 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-10-04 12:03:25 +0800 |
| commit | a759573d34fc8249c416857e15cf8d0fd9c99d1a (patch) | |
| tree | cb2d530d42301f84382686fd343f71223e9af157 /net/ipv6/reassembly.c | |
| parent | eebd4781fb3bb7b47568d8747d97d269d2649ec9 (diff) | |
| parent | cda2b9481445e798669f00fb8275d595f1ff943f (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-androidlsk-v4.4-17.09-android
Diffstat (limited to 'net/ipv6/reassembly.c')
| -rw-r--r-- | net/ipv6/reassembly.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c index a234552a7e3d..58f2139ebb5e 100644 --- a/net/ipv6/reassembly.c +++ b/net/ipv6/reassembly.c @@ -708,19 +708,13 @@ static void ip6_frags_sysctl_unregister(void) static int __net_init ipv6_frags_init_net(struct net *net) { - int res; - net->ipv6.frags.high_thresh = IPV6_FRAG_HIGH_THRESH; net->ipv6.frags.low_thresh = IPV6_FRAG_LOW_THRESH; net->ipv6.frags.timeout = IPV6_FRAG_TIMEOUT; - res = inet_frags_init_net(&net->ipv6.frags); - if (res) - return res; - res = ip6_frags_ns_sysctl_register(net); - if (res) - inet_frags_uninit_net(&net->ipv6.frags); - return res; + inet_frags_init_net(&net->ipv6.frags); + + return ip6_frags_ns_sysctl_register(net); } static void __net_exit ipv6_frags_exit_net(struct net *net) |