From patchwork Mon Apr 18 19:19:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hannes Frederic Sowa X-Patchwork-Id: 611872 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3qpdJd06Mcz9sDb for ; Tue, 19 Apr 2016 05:20:17 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=stressinduktion.org header.i=@stressinduktion.org header.b=P4YOhEJx; dkim=pass (1024-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b=UfNGjc7E; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751953AbcDRTUK (ORCPT ); Mon, 18 Apr 2016 15:20:10 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:36989 "EHLO out2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751509AbcDRTUI (ORCPT ); Mon, 18 Apr 2016 15:20:08 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 266D321498 for ; Mon, 18 Apr 2016 15:20:07 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute6.internal (MEProxy); Mon, 18 Apr 2016 15:20:07 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= stressinduktion.org; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-sasl-enc:x-sasl-enc; s=mesmtp; bh=M0Xuy HUWmQyJ50PAdTW+S3ZK748=; b=P4YOhEJxXO4j0d3rnpB5dcZiEr7tVs8Ktw/pU JuG8I/jt4pj5PD9BkVLWuznRiQPWZUbv/wGxB8pTJ+ZGnI5lleNpN2l3hAbKf/fr A51TMAinKf8Fc7sFJRrrE9NneJc2y4bKRZjIs1WWUnccwCttVPX1i3weY0SmlDvC +yTzqY= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-sasl-enc:x-sasl-enc; s=smtpout; bh=M0Xu yHUWmQyJ50PAdTW+S3ZK748=; b=UfNGjc7ELO2iWm0rhUbEkF6hHLvqcUNMnrwy XhMgObfCr1J7Ma6z5yQoTclCfBchpk/RH5e3HlBuYHhmgUOkSHfE4Gihiyu9+ziv fmlQ5GAVbBsve9HAA/5j2Tj7RSVPBEZyDiFjOZuYMfU6NSWaPirClU0DfHPxmcQb jwFWquw= X-Sasl-enc: IyhGkMSQQVRw3mmp3vVHt50l6YXPSYvJKvAIQcrz30t/ 1461007206 Received: from z.localhost.localdomain (unknown [213.55.184.201]) by mail.messagingengine.com (Postfix) with ESMTPA id 0912BC00020; Mon, 18 Apr 2016 15:20:05 -0400 (EDT) From: Hannes Frederic Sowa To: netdev@vger.kernel.org Cc: jesse@kernel.org, Dept-GELinuxNICDev@qlogic.com Subject: [PATCH net-next 5/7] qlcnic: protect qlicnic_attach_func with rtnl_lock Date: Mon, 18 Apr 2016 21:19:46 +0200 Message-Id: <1461007188-1603-6-git-send-email-hannes@stressinduktion.org> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1461007188-1603-1-git-send-email-hannes@stressinduktion.org> References: <1461007188-1603-1-git-send-email-hannes@stressinduktion.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org qlcnic_attach_func requires rtnl_lock to be held. Cc: Dept-GELinuxNICDev@qlogic.com Signed-off-by: Hannes Frederic Sowa --- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c index 1205f6f9c94173..1c29105b6c364f 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c @@ -3952,8 +3952,14 @@ static pci_ers_result_t qlcnic_82xx_io_error_detected(struct pci_dev *pdev, static pci_ers_result_t qlcnic_82xx_io_slot_reset(struct pci_dev *pdev) { - return qlcnic_attach_func(pdev) ? PCI_ERS_RESULT_DISCONNECT : - PCI_ERS_RESULT_RECOVERED; + pci_ers_result_t res; + + rtnl_lock(); + res = qlcnic_attach_func(pdev) ? PCI_ERS_RESULT_DISCONNECT : + PCI_ERS_RESULT_RECOVERED; + rtnl_unlock(); + + return res; } static void qlcnic_82xx_io_resume(struct pci_dev *pdev)