From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932570AbdESVDS (ORCPT ); Fri, 19 May 2017 17:03:18 -0400 Received: from mail.savoirfairelinux.com ([208.88.110.44]:48302 "EHLO mail.savoirfairelinux.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932386AbdESVDQ (ORCPT ); Fri, 19 May 2017 17:03:16 -0400 From: Vivien Didelot To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel@savoirfairelinux.com, "David S. Miller" , Florian Fainelli , Andrew Lunn , Vivien Didelot Subject: [PATCH net-next 02/20] net: dsa: change scope of notifier call chain Date: Fri, 19 May 2017 17:00:37 -0400 Message-Id: <20170519210055.9366-3-vivien.didelot@savoirfairelinux.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170519210055.9366-1-vivien.didelot@savoirfairelinux.com> References: <20170519210055.9366-1-vivien.didelot@savoirfairelinux.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Change the scope of the fabric notification helper from the DSA slave to the DSA port, since this is a DSA layer specific notion, that can be used by non-slave ports (CPU and DSA). Signed-off-by: Vivien Didelot --- net/dsa/slave.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 403d1dfe7f50..371f6d267917 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -27,10 +27,9 @@ static bool dsa_slave_dev_check(struct net_device *dev); -static int dsa_slave_notify(struct net_device *dev, unsigned long e, void *v) +static int dsa_port_notify(struct dsa_port *dp, unsigned long e, void *v) { - struct dsa_slave_priv *p = netdev_priv(dev); - struct raw_notifier_head *nh = &p->dp->ds->dst->nh; + struct raw_notifier_head *nh = &dp->ds->dst->nh; int err; err = raw_notifier_call_chain(nh, e, v); @@ -589,7 +588,7 @@ static int dsa_slave_bridge_port_join(struct net_device *dev, */ p->dp->bridge_dev = br; - err = dsa_slave_notify(dev, DSA_NOTIFIER_BRIDGE_JOIN, &info); + err = dsa_port_notify(p->dp, DSA_NOTIFIER_BRIDGE_JOIN, &info); /* The bridging is rolled back on error */ if (err) @@ -614,7 +613,7 @@ static void dsa_slave_bridge_port_leave(struct net_device *dev, */ p->dp->bridge_dev = NULL; - err = dsa_slave_notify(dev, DSA_NOTIFIER_BRIDGE_LEAVE, &info); + err = dsa_port_notify(p->dp, DSA_NOTIFIER_BRIDGE_LEAVE, &info); if (err) netdev_err(dev, "failed to notify DSA_NOTIFIER_BRIDGE_LEAVE\n"); -- 2.13.0