From nobody Mon Apr 13 21:40:09 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8C4A8C433FE for ; Wed, 16 Nov 2022 11:06:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238613AbiKPLGW (ORCPT ); Wed, 16 Nov 2022 06:06:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46038 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238495AbiKPLFm (ORCPT ); Wed, 16 Nov 2022 06:05:42 -0500 Received: from mail-lj1-x233.google.com (mail-lj1-x233.google.com [IPv6:2a00:1450:4864:20::233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 790A026578 for ; Wed, 16 Nov 2022 02:52:11 -0800 (PST) Received: by mail-lj1-x233.google.com with SMTP id b9so21327235ljr.5 for ; Wed, 16 Nov 2022 02:52:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rasmusvillemoes.dk; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=v2xrQk2QoCyteNifyf752ChzTmEoJc0akwXN/7mZghA=; b=YfHd5X8Fm9dFTkqIZ5zqj5PM0vD9bQ8Yq2Mx8q76pWZYve8hTYVa2e9rHhRlXd/Kps yFrjC30R+XS6HIRd6w/l3CWK/zTudgPrGT9wX0HOz8+sQlPSSy66T4UNKZqpLq1pzITC iQDFkQDAT5keVT9YQOIZMsOReK9dc1UfVS7FY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=v2xrQk2QoCyteNifyf752ChzTmEoJc0akwXN/7mZghA=; b=KMi+AhRUDO/xycf4WpZdNywMLzNxH3AAsAeYk3kIkHHgIq4nYirueRcAF9E53x/DjL Jyurl6Q8EwZIKqOs2rYO6AkPnupt0hCSrSqmNqiMDXs6fs5C1q2ELEKIkQLC7rdCov2y yP+070YyCGM25kBHA5w1UsqZbJHRFiAK3cYXrPFdqsVIDhdCzbKka+Jbh/54Ue41dW8E UzxZxBZVxx+AIOvD/l8MMkTbm9auQivlciD3g0IiryKY9S6iNWXaVBpPEYl+D3JfpEZT HB4IT8nLkv5DzTaYXPDflSATTtPvIHrPNPgOAUHTud75hPko8jVhsPtk03As/Hdeuk6R 1agg== X-Gm-Message-State: ANoB5plDUJv1D5W+NQqkYlX4Ngum4yFlhgsbd71AYKMtMcKWvwEM9NV+ WN7Eb1z+sIHuW+6pQacu8lE67w== X-Google-Smtp-Source: AA0mqf4UqMmKuAqhLDlKz1ZS51zEl8c7CRymYZthgAknebgfsxHP6+A/Ts1VpueTwhK9ox6z9gdGww== X-Received: by 2002:a05:651c:905:b0:277:71e4:20a3 with SMTP id e5-20020a05651c090500b0027771e420a3mr7303564ljq.332.1668595929858; Wed, 16 Nov 2022 02:52:09 -0800 (PST) Received: from localhost.localdomain ([87.54.42.112]) by smtp.gmail.com with ESMTPSA id g42-20020a0565123baa00b004b094730074sm2547119lfv.267.2022.11.16.02.52.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Nov 2022 02:52:09 -0800 (PST) From: Rasmus Villemoes To: Andrew Lunn , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Rasmus Villemoes , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 1/3] net: dsa: refactor name assignment for user ports Date: Wed, 16 Nov 2022 11:52:02 +0100 Message-Id: <20221116105205.1127843-2-linux@rasmusvillemoes.dk> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221116105205.1127843-1-linux@rasmusvillemoes.dk> References: <20221115074356.998747-1-linux@rasmusvillemoes.dk> <20221116105205.1127843-1-linux@rasmusvillemoes.dk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The following two patches each have a (small) chance of causing regressions for userspace and will in that case of course need to be reverted. In order to prepare for that and make those two patches independent and individually revertable, refactor the code which sets the names for user ports by moving the "fall back to eth%d if no label is given in device tree" to dsa_slave_create(). No functional change (at least none intended). Signed-off-by: Rasmus Villemoes Reviewed-by: Andrew Lunn Reviewed-by: Florian Fainelli --- net/dsa/dsa2.c | 3 --- net/dsa/slave.c | 13 +++++++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c index e504a18fc125..522fc1b6e8c6 100644 --- a/net/dsa/dsa2.c +++ b/net/dsa/dsa2.c @@ -1364,9 +1364,6 @@ static struct dsa_port *dsa_port_touch(struct dsa_swi= tch *ds, int index) =20 static int dsa_port_parse_user(struct dsa_port *dp, const char *name) { - if (!name) - name =3D "eth%d"; - dp->type =3D DSA_PORT_TYPE_USER; dp->name =3D name; =20 diff --git a/net/dsa/slave.c b/net/dsa/slave.c index a9fde48cffd4..d19e9a536b8f 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -2374,16 +2374,25 @@ int dsa_slave_create(struct dsa_port *port) { struct net_device *master =3D dsa_port_to_master(port); struct dsa_switch *ds =3D port->ds; - const char *name =3D port->name; struct net_device *slave_dev; struct dsa_slave_priv *p; + const char *name; + int assign_type; int ret; =20 if (!ds->num_tx_queues) ds->num_tx_queues =3D 1; =20 + if (port->name) { + name =3D port->name; + assign_type =3D NET_NAME_UNKNOWN; + } else { + name =3D "eth%d"; + assign_type =3D NET_NAME_UNKNOWN; + } + slave_dev =3D alloc_netdev_mqs(sizeof(struct dsa_slave_priv), name, - NET_NAME_UNKNOWN, ether_setup, + assign_type, ether_setup, ds->num_tx_queues, 1); if (slave_dev =3D=3D NULL) return -ENOMEM; --=20 2.37.2