From patchwork Thu Oct 8 06:04:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Feldman X-Patchwork-Id: 527612 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 BD136140D89 for ; Thu, 8 Oct 2015 17:01:55 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=i0W+TwbT; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751624AbbJHGBw (ORCPT ); Thu, 8 Oct 2015 02:01:52 -0400 Received: from mail-pa0-f50.google.com ([209.85.220.50]:35686 "EHLO mail-pa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751277AbbJHGBu (ORCPT ); Thu, 8 Oct 2015 02:01:50 -0400 Received: by pabve7 with SMTP id ve7so3518343pab.2 for ; Wed, 07 Oct 2015 23:01:50 -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=KoG5h7qWLJGnnzL7XPzawgf6vdcUH5vlucqbpZCsImg=; b=i0W+TwbTVgExwaufi2CN0xenedKsfI8a6jNAF69IEhpTLNYbhh3mgShpZZWzUzSrwF Cb8f5EQG7cOwpNOxdTHW5z+fU86qyW4sGcoShoWSuWRDL6PN82F8UEVO8nltjlgDQxbp bIKApEU21dlcd1RYOnNNIzJaLwSnaxzQGzzqD3fO5eWnpZhaKz3ipPo8DUacHVDLsI6S aVd+VlNGK4FN2bvIF4doY7jpcvb9KPH7zfArdjtJbM20m05Cw7ogcMKNAcJ12KUhC7d/ QkYBAaaH0tSJfeqw/LD+bSwS80O/5VGqZZMyQAjQs2rUijBV4Hqr03DHEPyAi+3Lj0TR ar3A== X-Received: by 10.66.219.162 with SMTP id pp2mr5991068pac.59.1444284110289; Wed, 07 Oct 2015 23:01:50 -0700 (PDT) Received: from rocker1.rocker.net ([199.58.98.35]) by smtp.gmail.com with ESMTPSA id rb8sm42932613pbb.63.2015.10.07.23.01.48 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Oct 2015 23:01:49 -0700 (PDT) From: sfeldma@gmail.com To: netdev@vger.kernel.org Cc: davem@davemloft.net, jiri@resnulli.us, siva.mannem.lnx@gmail.com, pjonnala@broadcom.com, stephen@networkplumber.org, roopa@cumulusnetworks.com, andrew@lunn.ch, f.fainelli@gmail.com, vivien.didelot@savoirfairelinux.com Subject: [PATCH net-next v2 2/4] switchdev: skip over ports returning -EOPNOTSUPP when recursing ports Date: Wed, 7 Oct 2015 23:04:41 -0700 Message-Id: <1444284283-33601-3-git-send-email-sfeldma@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1444284283-33601-1-git-send-email-sfeldma@gmail.com> References: <1444284283-33601-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 This allows us to recurse over all the ports, skipping over unsupporting ports. Without the change, the recursion would stop at first unsupported port. Signed-off-by: Scott Feldman --- include/net/switchdev.h | 1 + net/switchdev/switchdev.c | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/include/net/switchdev.h b/include/net/switchdev.h index 8d92cd0..f3de6f4 100644 --- a/include/net/switchdev.h +++ b/include/net/switchdev.h @@ -16,6 +16,7 @@ #include #define SWITCHDEV_F_NO_RECURSE BIT(0) +#define SWITCHDEV_F_SKIP_EOPNOTSUPP BIT(1) struct switchdev_trans_item { struct list_head list; diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c index 6e4a4f9..7a9ab90 100644 --- a/net/switchdev/switchdev.c +++ b/net/switchdev/switchdev.c @@ -147,7 +147,7 @@ static int __switchdev_port_attr_set(struct net_device *dev, return ops->switchdev_port_attr_set(dev, attr, trans); if (attr->flags & SWITCHDEV_F_NO_RECURSE) - return err; + goto done; /* Switch device port(s) may be stacked under * bond/team/vlan dev, so recurse down to set attr on @@ -156,10 +156,17 @@ static int __switchdev_port_attr_set(struct net_device *dev, netdev_for_each_lower_dev(dev, lower_dev, iter) { err = __switchdev_port_attr_set(lower_dev, attr, trans); + if (err == -EOPNOTSUPP && + attr->flags & SWITCHDEV_F_SKIP_EOPNOTSUPP) + continue; if (err) break; } +done: + if (err == -EOPNOTSUPP && attr->flags & SWITCHDEV_F_SKIP_EOPNOTSUPP) + err = 0; + return err; }