From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935247AbbI2QjV (ORCPT ); Tue, 29 Sep 2015 12:39:21 -0400 Received: from ip-208-88-110-44.savoirfairelinux.net ([208.88.110.44]:35032 "EHLO mail.savoirfairelinux.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933934AbbI2QjQ (ORCPT ); Tue, 29 Sep 2015 12:39:16 -0400 From: Vivien Didelot To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel@savoirfairelinux.com, "David S. Miller" , Andrew Lunn , Vivien Didelot Subject: [PATCH net-next] net: dsa: fix preparation of a port STP update Date: Tue, 29 Sep 2015 12:38:36 -0400 Message-Id: <1443544716-9130-1-git-send-email-vivien.didelot@savoirfairelinux.com> X-Mailer: git-send-email 2.6.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Because of the default 0 value of ret in dsa_slave_port_attr_set, a driver may return -EOPNOTSUPP from the commit phase of a STP state, which triggers a WARN() from switchdev. This happened on a 6185 switch which does not support hardware bridging. Reported-by: Andrew Lunn Signed-off-by: Vivien Didelot --- net/dsa/slave.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 0ae427c..02a3af8 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -453,12 +453,17 @@ static int dsa_slave_port_attr_set(struct net_device *dev, struct switchdev_attr *attr, struct switchdev_trans *trans) { - int ret = 0; + struct dsa_slave_priv *p = netdev_priv(dev); + struct dsa_switch *ds = p->parent; + int ret; switch (attr->id) { case SWITCHDEV_ATTR_PORT_STP_STATE: - if (switchdev_trans_ph_commit(trans)) - ret = dsa_slave_stp_update(dev, attr->u.stp_state); + if (switchdev_trans_ph_prepare(trans)) + ret = ds->drv->port_stp_update ? 0 : -EOPNOTSUPP; + else + ret = ds->drv->port_stp_update(ds, p->port, + attr->u.stp_state); break; default: ret = -EOPNOTSUPP; -- 2.6.0