From patchwork Wed Jun 10 20:56:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Feldman X-Patchwork-Id: 482878 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 1767C140297 for ; Thu, 11 Jun 2015 06:55:09 +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=GVcsFawk; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965293AbbFJUzB (ORCPT ); Wed, 10 Jun 2015 16:55:01 -0400 Received: from mail-pa0-f54.google.com ([209.85.220.54]:35746 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965196AbbFJUy6 (ORCPT ); Wed, 10 Jun 2015 16:54:58 -0400 Received: by pacyx8 with SMTP id yx8so41388941pac.2 for ; Wed, 10 Jun 2015 13:54:57 -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; bh=svba60eqgXlto+B0CU0UiE0nnBfLNKDx6fPM/S5gZ8k=; b=GVcsFawkHmly/bKA/l/2CpT17ZFGh2MMExL83nN5Y/2m0P0FCewKGKoVcRiI9Iev0o BfnrPwhgWJ+xo02LNgrV5CYqv+xBtaOcMaJmVchDWpO6ep/2tCFw1/zbS1PCu50NhvLs ZJrv+311FBrqEUQawrfrHAEvrgB4+5nOdYr4QFeRJKv7yrlZF7fLDdttrvcWxBPhj/ws YLcwI9aGTztWg+vWUiuMyIogqlJT3ing15RDMBTZeMZLlte2tA48vXgEE9DzZ/sCAeKj jgiRmfLte8KokHA6vcTbnvoa6b4pAX+CTYmS75zKBeqzwnPOj4tYp7piWkcq5mFUZjJg p3dA== X-Received: by 10.70.130.77 with SMTP id oc13mr8830979pdb.54.1433969697680; Wed, 10 Jun 2015 13:54:57 -0700 (PDT) Received: from rocker1.rocker.net ([199.58.98.143]) by mx.google.com with ESMTPSA id sn7sm9472310pac.5.2015.06.10.13.54.56 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Jun 2015 13:54:57 -0700 (PDT) From: sfeldma@gmail.com To: netdev@vger.kernel.org Cc: jiri@resnulli.us, bblanco@plumgrid.com Subject: [PATCH net-next] switchdev: fix BUG when port driver doesn't support set attr op Date: Wed, 10 Jun 2015 13:56:02 -0700 Message-Id: <1433969762-22406-1-git-send-email-sfeldma@gmail.com> X-Mailer: git-send-email 1.7.10.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Scott Feldman Fix a BUG() where CONFIG_NET_SWITCHDEV is set but the driver for a bridged port does not support switchdec_port_attr_set op. Don't BUG() if -EOPNOTSUPP is returned. Signed-off-by: Scott Feldman Reported-by: Brenden Blanco Acked-by: Andy Gospodarek --- net/switchdev/switchdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c index e008057..99bced4 100644 --- a/net/switchdev/switchdev.c +++ b/net/switchdev/switchdev.c @@ -103,7 +103,7 @@ static void switchdev_port_attr_set_work(struct work_struct *work) rtnl_lock(); err = switchdev_port_attr_set(asw->dev, &asw->attr); - BUG_ON(err); + BUG_ON(err && err != -EOPNOTSUPP); rtnl_unlock(); dev_put(asw->dev);