From patchwork Mon Mar 19 11:45:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kirill Tkhai X-Patchwork-Id: 10292233 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3CBEA600F6 for ; Mon, 19 Mar 2018 11:45:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 276A72922F for ; Mon, 19 Mar 2018 11:45:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 18D1429232; Mon, 19 Mar 2018 11:45:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B346B2922F for ; Mon, 19 Mar 2018 11:45:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755371AbeCSLpy (ORCPT ); Mon, 19 Mar 2018 07:45:54 -0400 Received: from mail-db5eur01on0104.outbound.protection.outlook.com ([104.47.2.104]:45378 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755327AbeCSLpx (ORCPT ); Mon, 19 Mar 2018 07:45:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=2HuzIFJbTinY8qk+VUIBrg7gCJZxY1dWjY+tyCOgJs0=; b=T2dFH959MstipX82h53joDddSXf7AUnNzg/JMv+zSpqZkHFklWt66pb3Q6q8JfwlPOnxmNIYfTUTnzNNVxP0VF9EAmxi1iYWztr3hUOx+NyKz+F1NvCELVXHrwpuEQkfZ84pLzKeCsLBVk5Z3d3T9scfNSNz1kEF+s8eOEfE2aQ= Received: from localhost.localdomain (195.214.232.6) by AM5PR0801MB1332.eurprd08.prod.outlook.com (2603:10a6:203:1f::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.588.14; Mon, 19 Mar 2018 11:45:48 +0000 Subject: [PATCH net-next 2/2] net: Convert nf_ct_net_ops From: Kirill Tkhai To: alex.aring@gmail.com, stefan@osg.samsung.com, davem@davemloft.net, pablo@netfilter.org, kadlec@blackhole.kfki.hu, fw@strlen.de, yoshfuji@linux-ipv6.org, brouer@redhat.com, keescook@chromium.org, ktkhai@virtuozzo.com, linux-wpan@vger.kernel.org, netdev@vger.kernel.org, netfilter-devel@vger.kernel.org Date: Mon, 19 Mar 2018 14:45:46 +0300 Message-ID: <152145994646.26348.3106975491506950180.stgit@localhost.localdomain> In-Reply-To: <152145973147.26348.4080298027358158796.stgit@localhost.localdomain> References: <152145973147.26348.4080298027358158796.stgit@localhost.localdomain> User-Agent: StGit/0.18 MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: AM5PR0602CA0019.eurprd06.prod.outlook.com (2603:10a6:203:a3::29) To AM5PR0801MB1332.eurprd08.prod.outlook.com (2603:10a6:203:1f::10) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3975f3b3-c2d1-4ce9-972e-08d58d8ef5fb X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:AM5PR0801MB1332; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1332; 3:kY6KClyjeGpW/sUQIMBi8NgqkWropRug3MsEn8gy4Un2dzvzTP0nFFLO5+UQjS/gQGXKig342H2aYlaHbmfrtEPQmndER+FTrv7w5CzcRh2yVo8faaW5mHa5SLVLGbZSIrgyesuoI8AdOsMT+gbmmNFEvAPYq+0qchMLvEPUDTb41Fpuf5F83I8h2hn5ideO5ZHZ8elppIOP9YPebiUer/G2U3GjJX1rjJIulji3Z0hBAcl9xO/Z6hi12QkzkTUQ; 25:G5PADMnsSBbvKAFkON9Z7bTXTd7WUHUzuNpDatScWyQSYE3TQgEKlcU4QTMQXerbe5ZGj4evAtOvey3Y8Orqs22EfvpNicPi6ctcmvyu7xl3A5RFMvOL1h0Sb6br9v8nZLVDeE14EjzNRzGXLxZK4rgNcBIThYYmn7APRVcHu1GePxYOY1/Ojs9XRc4rQLkPcw6/lYlPVsIH7rI1gzhvjavTBGxTZPlxU6xZHkjCoPHnt1ncpQaNIdX54dX/2OOIRq4XaOsug1GTIrbViBohDeewC9wY0gKQOHdsODbJka6O4gaxBmAiGL/XrA2HYB7RlYnKv63xkxi+6dUJNE82LQ==; 31:6TwtbtrF6457addLCv8v+dhNJcYXQycz1wAVXOTM2kCX9UDhTVLT4jUZHjTHTKlmHeWvhbY+eVoBiAmtkVRyiXFoRBEexuKiuzVbRLRKANwEWgHlYDTFmYKA3kTWMqGluhbxnMNMWRTaUO47/FrPQcxnHhSARt2VWvxqa5m9SxJEWFIDBY+UoOyj3bjtBRlkATmTI8VqQ4QkXvdFbzOuJTI93kxfxgnOp42rN8IIhSw= X-MS-TrafficTypeDiagnostic: AM5PR0801MB1332: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=ktkhai@virtuozzo.com; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1332; 20:1Boy9Qhd/YT5/H9bzKeCrsCQDBa6X6YJazLSBCI+K5hjg68yNnncDB7DEHIKVSST6VodiRNFaFau9UBm9+27ocvsdnEfw9Xt73/OcH5Fwvu8TbQnXAg29zv9W0/HEN59CRi64UdMVA10wbPGD8NOxInLKNWnlOrFb/cyhooxWwdWEoFrDqnpsoe4m/Fg5vkcERoI0PMRO6hj8wmuZBUXqlB5j7hi4Dloh2UP1xujrutPIiqS/rFX3YSIw1KLSfOlBKuNT72TQBa7/z/9nBDjyG9Lc6q/7WKRVU6/KZHkEvrZkYmT9jAMzM7cK2pFNzKuS4qtphhRJL08DFdHyU+lCx4XFFhXKeaiklwugghFFi8XFgIaxNJj40g57wUcPr9OUViafbp78EkGcdQ3KYcSgoNp99piW9rG0ksFhrggJM/87KCnDTyKewUcoQOSvchIwjg0mn6uNJ6NYnSGVG+wsovzcKdwCiYr+fLYpREvwd8JJ0470v/VXHovy1uUBMyr; 4:Z3RaLRim/a50BAOsJS4Liu/UH6His2+rLpw6upz1bx1/P0q9vTpTgHYIJBt8IW5R/nSR16eDUDHlvoBvQ4ZefAsE7qowX1Pvj4rKEl6ds/H5saco0NL60eCs2mNvVYaV775ElPv6xDEaQJuPT5hZwOCDsmmB64qEE/4XexZG8g/JZa47029pcRtIeXem6Lf8f9XuH8vjPYqGVne6KTC6avvq8YkZLNLJlCZSOyJCG9Ryev1XSZfdchEK3vPSf/I3AqHLdt3hkT5twHUlSJYBKA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(10201501046)(3231221)(944501300)(52105095)(93006095)(93001095)(3002001)(6041310)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123560045)(6072148)(201708071742011); SRVR:AM5PR0801MB1332; BCL:0; PCL:0; RULEID:; SRVR:AM5PR0801MB1332; X-Forefront-PRVS: 06167FAD59 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6069001)(39380400002)(396003)(366004)(376002)(39840400004)(346002)(199004)(189003)(50466002)(66066001)(47776003)(7736002)(305945005)(2906002)(97736004)(7416002)(5660300001)(86362001)(316002)(53936002)(33896004)(3846002)(81156014)(55236004)(386003)(81166006)(8936002)(6506007)(230700001)(103116003)(55016002)(6116002)(9686003)(16526019)(106356001)(2950100002)(68736007)(2486003)(39060400002)(26005)(23676004)(186003)(52116002)(7696005)(478600001)(58126008)(25786009)(8676002)(61506002)(76176011)(105586002)(921003)(1121003); DIR:OUT; SFP:1102; SCL:1; SRVR:AM5PR0801MB1332; H:localhost.localdomain; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtBTTVQUjA4MDFNQjEzMzI7MjM6eDY3bFZSMGVVYVROamVRZ3VsMlFSckd0?= =?utf-8?B?aTRHSVFxSDBOY3FWb3NqWUV6bVg4cmJTR21BeUUxeUxWZzlHWDczVldvVHN3?= =?utf-8?B?TEN2ZFRZY2NydC8zWXcxNGxWVVo3bE5SMUkxTHhJMzhOTFZMODRsOVNuMXBv?= =?utf-8?B?bGtGM0ZwVnZMOVgrbnk4dUczb0wydlZBSSt4V3BiSG9BNm11cm5GQ3FDOGRU?= =?utf-8?B?eDZ2VHBpNjBqdnRDcUcwWUhOcFVwNUxJMSs2aFN0RUJYQ0Vwc01xanFlaUJW?= =?utf-8?B?L0pPaExNT0tiRVdQQURVMjBQTnpFa21JUjBvZWRoeG1GaDR6T2dqek5GUXIr?= =?utf-8?B?SGlSeG8xZkUySERsYytaTzVDVzJ3YjJ6N2hidy96WTJoN2paMGl6ZGxJM2xl?= =?utf-8?B?Zm02N0dXWUV3bmc1QkhlUCtHWG1IVy8yUG54NEhXSUFQRE5GMkpaRWorV1Jz?= =?utf-8?B?dkUycXo4dWtKeG1rNWZEblN6VCtBYkhldlpEdmVZTTQrRmpPYjMwUi8vTisy?= =?utf-8?B?cUpiOVV6aGl3N0xuR2FIY1RoWVpuWmZ1OFpNVyswUllsbmhvMXY2djJ5MWtZ?= =?utf-8?B?eld4dnpOUnRzQ1RzWnZUQ2ZJaVFlc2xaZ3ZSRENWUHdhU1ZsbURFbG93TDZS?= =?utf-8?B?aE0zbkwweFNFZ2tzODM4UUFoRHl0aWswTlBERExUUXoxNEk4M3ZGN1FLdGlN?= =?utf-8?B?bkswd2NvZktEWjZta3B1WWFyaW1xa2lDYlEwN2NWVmJLQS9raFR5ZmM1WFda?= =?utf-8?B?bVAxc3hnaTdEOXU0QnM2ekdHR05vOUhaTmZvUURha1d0TlhBS1BSWTBxRUxC?= =?utf-8?B?aCtSUGk4a2VRdTdUakE0cVZuaEJzakUwU1pTcXREcm5ONlBaRHcyb3ZXUFdu?= =?utf-8?B?bFphenB6dS95dzJhcUVnS3Y5M0J0MFh1alhERVg4eDZVQzZXNWppNHpxTzkr?= =?utf-8?B?U2lmU2lEeUxUSGIyc3dWYmE1Y2IxV3NqZkNGTmFqKzZNcnlXN2lha0xhMHpL?= =?utf-8?B?ZlExbHdoUURaLytUdTFiUkNUMERWcGFYV2MzQkxzTHNuelIyQmVPTWhrQjJw?= =?utf-8?B?STl5K3lnVVFaSGRFL3VkU09hVFRaeVViWXVQSm04ODVPZlF5OG5mdlNsY3BO?= =?utf-8?B?cm5OT0F2TDdRWWsweFphNklFZUZ2YjhxMW1KUElZVEF1dmpFYkNaRWRoYjNu?= =?utf-8?B?aElZdmdTdmVUd2ZXL0tacGNPVm84RHRxUVdpNEI3NUM3WXpxQnNoTVE2T3F2?= =?utf-8?B?Z0E2d3FTWUVDQ3VORkN4WVlFM1BEL3hpMHEvSmo4eGFKbnYyV1NyRUJqdTFt?= =?utf-8?B?NFBzN3VjdDQ1N253bjcva1lwazNBR3pxbkZFQXRZcTVNVjczL1M2NnFBb28z?= =?utf-8?B?RW1yd09FUXNzcmxEWm5YNUxLUVVxZGpPS2N2b1VvZ3JiYUJkOHVndEZQUU9x?= =?utf-8?B?Znd6M0pqRzZmTjdhWXRQNlhzU25oUzJaY1VJc3BnR1R1Q0tMZERTZzZ5bHZQ?= =?utf-8?B?NFE3WkpNYXhaZnpLMWQxMU53a2czbzN2RnRnaE1EZzczMkhkcDV6cTZ0eGUr?= =?utf-8?B?SlFHTVJEdWNHak9FSEdTTVVxU3Y2QVlpazQzOXV3cDYwMDFJS1BlcEtPNWU1?= =?utf-8?B?M0M4Z3h0S3FIbVRzUkFKZFMvM0ZyK3BXd2xqZW9JSmp6Qkxlc2c1MHV3cmc9?= =?utf-8?Q?=3D?= X-Microsoft-Antispam-Message-Info: Q7TTxdT5scD0uDUvpWZXDStsrSbc5fCJzMoqA0EfRn/NaYaXslUTu9BJNTP/nx/OI0eX5RoLM/nsCin0gZ4ocbGrBrg0kpy3oFwZvHeDXLfjWPTvXNx1Yzd+H+ueEXCGkNcll895hIJawQRQlQkiV40fgzF/5e1x3C2Amd8ShpGcV/9jmQ42eZuJZ2zsS6n2 X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1332; 6:5nH3UHEwJDPoNscX0+EcqR+wrVYnD/6h0csh5OdEXQS9f1d21SpJaoaJFgYdou8e4b0aIXyAGHUUM4EQnZHyLno2r8+KyjjKDmNqRSuyv+56SV6dvEp/2VpNZKFGhN40ZF8+R51P47uopQEPPaDEb5m/mJ7As9BIn/FekaruB3oKNrUHTD5Z8cZ8OFH0jgYy97TE3fSdODzKGb0suY6KtXPlk1iX5ajyOYJ9ETaMsa6y8nMwWGQ3yCQZards5LqCB3HaztnSPqfjW5P4oR4DxiGl8uc61PwiCWW4NtBulWf5GMcvJAp84CfCBcb3UgYJQ90Er9n0a41cyuHXU+lKDUTWJzoafpiyynRsbxzZMCA=; 5:hkMGFsNPNtCuwxxGfmlGl10qO4iKrWj+9/5A9aK4ko++hkC90KFXVUEfbepeWkgqn8VfFefAcqsbQ70EXfgGvduU0J4FH/bmju02v+BR5UAmmuCaVh2ObOdTE2vY88eQz/2hJ0wsAkdQpzAtyWgcp2xJpZdPYcBiko6cRPCS21U=; 24:6i9JtXgGwH1zgsxB+hAA4Zo9JohmjzRg2W7K9u535qe0FywBm3DdOL/FdPp7zm83Z59aX5b6TDYaQpGibHWVtP/Bk803mdspyoLGBZfAUZg=; 7:wHcWdAWeMBR3s83T8SGOpg4wOW2SazPIvd+yNVADdfMDtZE4rapyvUdT+Ym4lDmCUjfbuH7V4FNEqSfsPOqiLaZthEnwImjidGcHE6KnQAdPzaJd5j1Gdy5p9LKR8PfIKQ3hb59Yb1+x0RrJG6yjB1ez6p8TBfhwnF0DK4jgiqU9NH5VswL79Kdt809lp4w25SXH+g2nKa8akEW8ZcuQcJlMCuk9Ras7twMTJ3QaLeK7tpfrh2RYD263KK3SPsBF SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1332; 20:J99mEsYWAlxRiekoZVaXQNA1yItYTOI4eNduOc4xs+ME9EdPGr3onAmQUJiCqcTk5Gs9yQ9udso2Kdool9qDhE/teX9Fdkp9DeImh7tpJyJFAY5HJrW17kimBB48tMHnpkHBNG0QsnnEmjB6+Zlv7evbr7qF8rjU4RCD+jVimz8= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Mar 2018 11:45:48.8008 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3975f3b3-c2d1-4ce9-972e-08d58d8ef5fb X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1332 Sender: linux-wpan-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wpan@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP These pernet_operations register and unregister sysctl. Also, there is inet_frags_exit_net() called in exit method, which has to be safe after a560002437d3 "net: Fix hlist corruptions in inet_evict_bucket()". Signed-off-by: Kirill Tkhai --- net/ipv6/netfilter/nf_conntrack_reasm.c | 1 + 1 file changed, 1 insertion(+) -- To unsubscribe from this list: send the line "unsubscribe linux-wpan" 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/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c index b84ce3e6d728..34136fe80ed5 100644 --- a/net/ipv6/netfilter/nf_conntrack_reasm.c +++ b/net/ipv6/netfilter/nf_conntrack_reasm.c @@ -646,6 +646,7 @@ static void nf_ct_net_exit(struct net *net) static struct pernet_operations nf_ct_net_ops = { .init = nf_ct_net_init, .exit = nf_ct_net_exit, + .async = true, }; int nf_ct_frag6_init(void)