From patchwork Sat Jun 13 04:35:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Feldman X-Patchwork-Id: 483817 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 A6006140273 for ; Sat, 13 Jun 2015 14:34:24 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=CPnE6Dwr; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751333AbbFMEeT (ORCPT ); Sat, 13 Jun 2015 00:34:19 -0400 Received: from mail-ig0-f182.google.com ([209.85.213.182]:37314 "EHLO mail-ig0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751338AbbFMEeH (ORCPT ); Sat, 13 Jun 2015 00:34:07 -0400 Received: by igbsb11 with SMTP id sb11so21926309igb.0 for ; Fri, 12 Jun 2015 21:34:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=tNPEVk2c52r03WelMp6uoaBvpt//eLPd3xWip0RNnaE=; b=CPnE6Dwrosk7sft+Ku+OwkJ8xh8RnDIQlf6ai6SQKJqtAjFOG5sxnmLTNdqlx1ukcb 9ESnw1k7HadP5fOWANDRLtGYVHCEs16lNKIfDJcIX/B2e5TVswFF4d44xi1cK84uQKwu n1EtMxJXZf+MW8jnr5uUZAwTzI9WhPV4r1KnpWSOms4x3/mSdS2yZGW3ds4xI2+Vvk+x TqLP1kbQiCNXyJcSvEVa3s4z/W1Ylfgff5+1tf+kZEUXc36xbl+fbc8HZ3ibNet3v3Wn nAx59x7XzWADCHsm9B6ZuhlgrEEcAPMGcXEMZdsCbyCgVfrUyUr+UPm4Mmso0pgEpLTr jaCA== X-Received: by 10.107.169.21 with SMTP id s21mr979639ioe.74.1434170047094; Fri, 12 Jun 2015 21:34:07 -0700 (PDT) Received: from rocker1.rocker.net ([199.58.98.143]) by mx.google.com with ESMTPSA id 140sm3948094ion.16.2015.06.12.21.34.06 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Jun 2015 21:34:06 -0700 (PDT) From: sfeldma@gmail.com To: netdev@vger.kernel.org Cc: jiri@resnulli.us, simon.horman@netronome.com, makita.toshiaki@lab.ntt.co.jp Subject: [PATCH net-next 5/5] rocker: move port stop to 'no wait' processing Date: Fri, 12 Jun 2015 21:35:50 -0700 Message-Id: <1434170150-63838-6-git-send-email-sfeldma@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1434170150-63838-1-git-send-email-sfeldma@gmail.com> References: <1434170150-63838-1-git-send-email-sfeldma@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Scott Feldman rocker_port_stop can be called from atomic and non-atomic contexts. Since we can't test what context we're getting called in, do the processing as 'no wait', which will cover all cases. Signed-off-by: Scott Feldman --- drivers/net/ethernet/rocker/rocker.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c index 8430cb3..a06b93d 100644 --- a/drivers/net/ethernet/rocker/rocker.c +++ b/drivers/net/ethernet/rocker/rocker.c @@ -4004,7 +4004,8 @@ static int rocker_port_stop(struct net_device *dev) rocker_port_set_enable(rocker_port, false); napi_disable(&rocker_port->napi_rx); napi_disable(&rocker_port->napi_tx); - rocker_port_fwd_disable(rocker_port, SWITCHDEV_TRANS_NONE, 0); + rocker_port_fwd_disable(rocker_port, SWITCHDEV_TRANS_NONE, + ROCKER_OP_FLAG_NOWAIT); free_irq(rocker_msix_rx_vector(rocker_port), rocker_port); free_irq(rocker_msix_tx_vector(rocker_port), rocker_port); rocker_port_dma_rings_fini(rocker_port);