From patchwork Sat Jun 13 04:35:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Feldman X-Patchwork-Id: 483816 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 B7199140273 for ; Sat, 13 Jun 2015 14:34:20 +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=hp4jzK1Z; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751375AbbFMEeP (ORCPT ); Sat, 13 Jun 2015 00:34:15 -0400 Received: from mail-ie0-f175.google.com ([209.85.223.175]:35202 "EHLO mail-ie0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751005AbbFMEeF (ORCPT ); Sat, 13 Jun 2015 00:34:05 -0400 Received: by iesa3 with SMTP id a3so34891302ies.2 for ; Fri, 12 Jun 2015 21:34:04 -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=8ohsNdBewd3mWwTwBcvjYYmvQJF3yuvCwZXnTPiTlgo=; b=hp4jzK1ZrYl8BgaF7zwAIb20IXI+8ZukHy+o1iAeJWw6EF2SObX5VwfqMZrygMjV0p O6ytkDGq15xi0YpB/N9D1CoMkE7tB64aBj4Ap2OLh8G2PJa8Fahc5fRxZtsHqZBINuBt JqAGvv3ptkphIavPwFOLEDuxI/esRGQKTZXBlft0ehssS8SCs9x6XzUzS3eukHRtR/41 VMmQKdUk6Xyo7BRkDQozadJ8yIQKtYJ5/TkYR6ui6nMYsTbKkklf8jbGO/d9RupRtxe8 UQp4R/bBHkT7BfMv2IfrhpK9V40+RgeT8Fw26zygM38cT2769zHBKcqJXl6M6J364uj+ lbow== X-Received: by 10.107.46.2 with SMTP id i2mr14414351ioo.18.1434170044299; Fri, 12 Jun 2015 21:34:04 -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.02 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Jun 2015 21:34:03 -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 3/5] rocker: mark STP update as 'no wait' processing Date: Fri, 12 Jun 2015 21:35:48 -0700 Message-Id: <1434170150-63838-4-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 We can get STP updates from the bridge driver in atomic and non-atomic contexts. Since we can't test what context we're getting called in, do the STP 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 1995b59..6c15c2e 100644 --- a/drivers/net/ethernet/rocker/rocker.c +++ b/drivers/net/ethernet/rocker/rocker.c @@ -4286,7 +4286,8 @@ static int rocker_port_attr_set(struct net_device *dev, switch (attr->id) { case SWITCHDEV_ATTR_PORT_STP_STATE: - err = rocker_port_stp_update(rocker_port, attr->trans, 0, + err = rocker_port_stp_update(rocker_port, attr->trans, + ROCKER_OP_FLAG_NOWAIT, attr->u.stp_state); break; case SWITCHDEV_ATTR_PORT_BRIDGE_FLAGS: