From patchwork Tue Jun 29 00:29:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 468610 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9FAC2C11F64 for ; Tue, 29 Jun 2021 00:29:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7564461CDA for ; Tue, 29 Jun 2021 00:29:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232191AbhF2AcD (ORCPT ); Mon, 28 Jun 2021 20:32:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56990 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232182AbhF2AcD (ORCPT ); Mon, 28 Jun 2021 20:32:03 -0400 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE72EC061574 for ; Mon, 28 Jun 2021 17:29:35 -0700 (PDT) Received: by mail-ej1-x633.google.com with SMTP id bu12so33158311ejb.0 for ; Mon, 28 Jun 2021 17:29:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KORehOK4WOMSJSyCcBUoH60fOJezcrogsSxtZqobNEY=; b=Skr4PqmS/6QlUfEFSFq6UXlf7CY3yfDtP0SwV194Tmy25ZaX+umRJnCHQSZhvx4TvC KBsjXNZcUXJ/Ho+10amsnuDac8mfVODSaImKf5ardQfU3kyh0h8byaa4l9RuNzB/fova bKmUkSUeBdjuAgwQK2Q2e4PEZU+KEruj2p1H+vzguiWsO+NHxeCWU1jbFPWw1TsKco0M fZ0jrdUK35Obs78KegUtVt6USNbHVojE1V/LrvpuWCtND+ydGItCo6fB5RV4KeNmrby6 kAeMzbwSqdqmVrJI2GxUXZ8DXMhL+pEtfQXXDfaN/ZuYBApnZ4gVISePyD5i09TcP3rw BVvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KORehOK4WOMSJSyCcBUoH60fOJezcrogsSxtZqobNEY=; b=fIOT3ndItv5++ZsvDPQgbkahSmz1i/vDPTiH4CPRy6A7nsvXt6r9A9wPbInwadhhYl 6V9F3BvbBEh9G+9uS6CEEnqnv16R5WNarTABR9MEe7HxMDy2Lza75GR6Yuas7D1Pkle7 rDjVMqrIwgjSCqa2IX30nDYWYHeMqClln1g5LQN5miHWM3oplyHxlXeNXd+wmIAn1fDs /+LPi3Lnsc+qqYsCpXZ3kw5q3WhoVA7EMkXOpBf9eg1FrC2pxLFZ7a0/ZSJXNmdDZsME lXQ4EpONkF9PKU3OVGy7UdGY3aZke3am5op7gslFwLiKh5G+ZqEdB1/plwEzoEmuoVpA tcrA== X-Gm-Message-State: AOAM530Y4Hr3yv/23f+or674NzdGfzQXdNEgKt1Iw5GRpQ+U8WDq2Zct o+QBne/m/bnJTinm+S3vpVKKPBWkLtk= X-Google-Smtp-Source: ABdhPJyUQQU/WE4dF6H6FF0KyzO+NP3vBOQNbMLBpUp3ENwkkfx+C5+7fOY+oOezwRVPtkCSY51nxQ== X-Received: by 2002:a17:907:1ca0:: with SMTP id nb32mr26224543ejc.105.1624926574283; Mon, 28 Jun 2021 17:29:34 -0700 (PDT) Received: from localhost.localdomain ([188.26.224.68]) by smtp.gmail.com with ESMTPSA id s7sm7749913ejd.88.2021.06.28.17.29.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Jun 2021 17:29:34 -0700 (PDT) From: Vladimir Oltean To: netdev@vger.kernel.org, Jakub Kicinski , "David S. Miller" Cc: Vladimir Oltean Subject: [PATCH net-next 1/2] net: use netdev_info in ndo_dflt_fdb_{add, del} Date: Tue, 29 Jun 2021 03:29:25 +0300 Message-Id: <20210629002926.1961539-2-olteanv@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210629002926.1961539-1-olteanv@gmail.com> References: <20210629002926.1961539-1-olteanv@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Vladimir Oltean Use the more modern printk helper for network interfaces, which also contains information about the associated struct device, and results in overall shorter line lengths compared to printing an open-coded dev->name. Signed-off-by: Vladimir Oltean --- net/core/rtnetlink.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 745965e49f78..ab11c9d5002b 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -3947,12 +3947,12 @@ int ndo_dflt_fdb_add(struct ndmsg *ndm, * implement its own handler for this. */ if (ndm->ndm_state && !(ndm->ndm_state & NUD_PERMANENT)) { - pr_info("%s: FDB only supports static addresses\n", dev->name); + netdev_info(dev, "FDB only supports static addresses\n"); return err; } if (vid) { - pr_info("%s: vlans aren't supported yet for dev_uc|mc_add()\n", dev->name); + netdev_info(dev, "vlans aren't supported yet for dev_uc|mc_add()\n"); return err; } @@ -4086,7 +4086,7 @@ int ndo_dflt_fdb_del(struct ndmsg *ndm, * implement its own handler for this. */ if (!(ndm->ndm_state & NUD_PERMANENT)) { - pr_info("%s: FDB only supports static addresses\n", dev->name); + netdev_info(dev, "FDB only supports static addresses\n"); return err; } From patchwork Tue Jun 29 00:29:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 469073 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AF997C11F66 for ; Tue, 29 Jun 2021 00:29:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9322A61CE5 for ; Tue, 29 Jun 2021 00:29:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232196AbhF2AcF (ORCPT ); Mon, 28 Jun 2021 20:32:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56994 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232170AbhF2AcC (ORCPT ); Mon, 28 Jun 2021 20:32:02 -0400 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6DF9BC061760 for ; Mon, 28 Jun 2021 17:29:36 -0700 (PDT) Received: by mail-ej1-x631.google.com with SMTP id o11so19894123ejd.4 for ; Mon, 28 Jun 2021 17:29:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9yY9rUOeHTAfNAX7TPdrQx7lohfVPDcglIE/cAbjlR4=; b=YpljY6p8G+g5HySYKJf+rGtAoR5ShrcGRod5zaeEkMeU6+N6lODIe9gVfzIFzbgXgD /ed/HrzQvLXZnDOX7P+YuXk6SagHxjtxcTCN9dg1XsCCvhHxNjYEW3MoqSUd8eKwjbUK 5iHcguDX15MT51eHBjF0iq8wM5JEixwDvw/0SuacqpsyMqEQt2pljzON5q6ut08uXLf0 GRPLU0KsWC+ZNGInnuEvF5W/nGaa0lzrCL7OtF1hxmo41r9kQQuI8qvJZgIPuHksiFSn UZU5E8ov3Gs4SCeBLRTw8+JG4bdOHw68oXVRau9npifCcjinf1BFPfDKb/l75Hc9nk8f gGJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9yY9rUOeHTAfNAX7TPdrQx7lohfVPDcglIE/cAbjlR4=; b=E8xbdzmy6DHrZ05xj3pzEFvc1Rw2kW8dr5U1fflQr5uqsJFVKfrSiHpxe1tVtRiwwh l6FrGDIh0pmeXxiNN9q0TJ4f70y4UAvkSxv7j6ZEY9aE+Yukt1MiG3INQuYrKboUY31r uyvUNs1vSCR93P9HVEbJZ+/kndoSE1G+WRqUCfg8W5IghFqNEc1fVRnVksNpdQOYevII s7crNZf4oHxMwIwx4fnoYqOmM380MyI+pt+EwanSAckmOmiVJaheCv1YieggHSHoYtdW 6c9jdEi2e69hA6anwZaV+wu7XpEkv1hd2S+RWXF6MvETcjDCeC8rJyO+flW6j3l5lsgc vj+g== X-Gm-Message-State: AOAM533MIUf6qALnpGLci0vP9BhKZyf6zHpdyt3umnBOczJ1GAkTPv6u aLqGgp19u5ekv14Y0yUNxzgOY5oIe3g= X-Google-Smtp-Source: ABdhPJwuDaoKUzIl2oUsn17R9rtzS7JVJjr9/iq3NDaH/H3ERGl2FcHqAJy7PnRLdg5qQrc7UdPyjA== X-Received: by 2002:a17:906:7212:: with SMTP id m18mr26831241ejk.351.1624926574891; Mon, 28 Jun 2021 17:29:34 -0700 (PDT) Received: from localhost.localdomain ([188.26.224.68]) by smtp.gmail.com with ESMTPSA id s7sm7749913ejd.88.2021.06.28.17.29.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Jun 2021 17:29:34 -0700 (PDT) From: Vladimir Oltean To: netdev@vger.kernel.org, Jakub Kicinski , "David S. Miller" Cc: Vladimir Oltean Subject: [PATCH net-next 2/2] net: say "local" instead of "static" addresses in ndo_dflt_fdb_{add, del} Date: Tue, 29 Jun 2021 03:29:26 +0300 Message-Id: <20210629002926.1961539-3-olteanv@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210629002926.1961539-1-olteanv@gmail.com> References: <20210629002926.1961539-1-olteanv@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Vladimir Oltean "Static" is a loaded word, and probably not what the author meant when the code was written. In particular, this looks weird: $ bridge fdb add dev swp0 00:01:02:03:04:05 local # totally fine, but $ bridge fdb add dev swp0 00:01:02:03:04:05 static [ 2020.708298] swp0: FDB only supports static addresses # hmm what? By looking at the implementation which uses dev_uc_add/dev_uc_del it is absolutely clear that only local addresses are supported, and the proper Network Unreachability Detection state is being used for this purpose (user space indeed sets NUD_PERMANENT when local addresses are meant). So it is just the message that is wrong, fix it. Signed-off-by: Vladimir Oltean --- net/core/rtnetlink.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index ab11c9d5002b..f6af3e74fc44 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -3947,7 +3947,7 @@ int ndo_dflt_fdb_add(struct ndmsg *ndm, * implement its own handler for this. */ if (ndm->ndm_state && !(ndm->ndm_state & NUD_PERMANENT)) { - netdev_info(dev, "FDB only supports static addresses\n"); + netdev_info(dev, "default FDB implementation only supports local addresses\n"); return err; } @@ -4086,7 +4086,7 @@ int ndo_dflt_fdb_del(struct ndmsg *ndm, * implement its own handler for this. */ if (!(ndm->ndm_state & NUD_PERMANENT)) { - netdev_info(dev, "FDB only supports static addresses\n"); + netdev_info(dev, "default FDB implementation only supports local addresses\n"); return err; }