From patchwork Fri Oct 9 02:23:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Feldman X-Patchwork-Id: 528068 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 98544140D8C for ; Fri, 9 Oct 2015 13:20:39 +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=0Q/Al6U3; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932309AbbJICU3 (ORCPT ); Thu, 8 Oct 2015 22:20:29 -0400 Received: from mail-pa0-f49.google.com ([209.85.220.49]:34633 "EHLO mail-pa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932262AbbJICUZ (ORCPT ); Thu, 8 Oct 2015 22:20:25 -0400 Received: by padhy16 with SMTP id hy16so71428235pad.1 for ; Thu, 08 Oct 2015 19:20:25 -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=ZTZyZ1m6iNBuq4lrmmILd2fhjjE24x/9YWkQROpxD9A=; b=0Q/Al6U3V3+4vBzi3AjmGa3QPu7NDYDa8SHW0kCVhUfgOMmPfayuzwg+6c0hCfMQky iNbHoLdmqee62oIhl5VczWYXy/sWSLjHlDUsmsRwbwLbou4La26UXJFZoDeqAPYm1cz/ F8/ebeFqrv8077gFjpXlFCMbUAp4HQoH1YEoN/hh5yZjH0ukenHfu8Zf6hWJ3sSvzbuk bkhiGYzqWeCgiSVrrszrQk+8AySsleQxK05SgTukA/QMPKvKLSnZp80bfM1zAB9yLB4h LOZAuqZlb+iESKPJIIpUR8qMdutjQ4oCEqny9KKmL/wLTgZTNlVJ62k+qjxhxy7KD1d/ cD8A== X-Received: by 10.66.253.199 with SMTP id ac7mr11940507pad.56.1444357225390; Thu, 08 Oct 2015 19:20:25 -0700 (PDT) Received: from rocker1.rocker.net ([199.58.98.35]) by smtp.gmail.com with ESMTPSA id u3sm48036789pbs.33.2015.10.08.19.20.23 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Oct 2015 19:20:24 -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 v3 2/4] switchdev: skip over ports returning -EOPNOTSUPP when recursing ports Date: Thu, 8 Oct 2015 19:23:18 -0700 Message-Id: <1444357400-37078-3-git-send-email-sfeldma@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1444357400-37078-1-git-send-email-sfeldma@gmail.com> References: <1444357400-37078-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 Acked-by: Jiri Pirko --- 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 61f129b..1ce7083 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; }