From patchwork Wed May 6 15:47:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Taehee Yoo X-Patchwork-Id: 1284523 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=dVQ73/4u; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49HLZB6fZ0z9sTw for ; Thu, 7 May 2020 01:47:14 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729472AbgEFPrO (ORCPT ); Wed, 6 May 2020 11:47:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34024 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729148AbgEFPrN (ORCPT ); Wed, 6 May 2020 11:47:13 -0400 Received: from mail-pg1-x541.google.com (mail-pg1-x541.google.com [IPv6:2607:f8b0:4864:20::541]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 93D4BC061A0F for ; Wed, 6 May 2020 08:47:13 -0700 (PDT) Received: by mail-pg1-x541.google.com with SMTP id n11so945514pgl.9 for ; Wed, 06 May 2020 08:47:13 -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; bh=my6Nl83bIoL5iwRQhs+wXrxy12W6scxePc37sQf7baI=; b=dVQ73/4uLXAwc5MwPCrg4sROVJNLYzga/FfF15xx6/3YkFVWkCBQ2AkLYqVjv4hRiD LI96O1gArropdNTX4cSlO5qt/5mPZXpjidaoHkb/jy18wjWrqouscidKOniYb1QuxUao 3NxtDGDODRflRvKMbcpmLHd56xzOvkvChzjQXB4U+m7BBTKdlzaR7tuNYBtDcuKaaF3Y w4tM25WEXc/YLa79vPcO10FrenrmZvACoNokbPR7SNQvZKubyJfesXFlCY60BKavfJBU TOyeY/Blq2Um+Lab5yqciq6h4uXnsWYct6FhenYg9g9/Y3GLRsBbZumizLrEcqJ/JqoB ITCQ== 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; bh=my6Nl83bIoL5iwRQhs+wXrxy12W6scxePc37sQf7baI=; b=ozcPidvCU7iT3ZP3X/cVVIuQ/qnxXhzVv1Zyz2/PSIy1be8XnoPgN38aXqy79x1wro 9F2eS2ukUa4uRy3GHul1brAo9DZCZNl2uR+wo047wQCbr/OoaFipl3cEpjEiJEzgEn5G +rk1EjzlC9Jq581fLue3G2iiWBnyOr8hUHVl4aEIDKCDpJqvtxLwuFBeJi6iLvohfm5z bXWe6TZDfyZCb2H6FCXHJDEb7qMu50u/gr9Ge7vpZYhmz8MGfh9FYEKew27/q5YaNsER 6MdA7lF8UOcQZTsBeKNCiJDvPNORPOedt83/EHflflsoeEw47gxEV6dTn8M8/ZaPDGkz J0ow== X-Gm-Message-State: AGi0PuZ1U2Lvfe9yrEeZZo2sjVcOi4Z1LJGoeeekwazvFhLq+lpb4yts sVI7/7ERKUlyNYeWdZ1mnVw= X-Google-Smtp-Source: APiQypLV+qsacLMbDvBzIpxiCjLDkBf1KSJsLesgMWQm7B6bPRak4/TkL8177MrQDFxBFITYhVsGdA== X-Received: by 2002:a62:1dd2:: with SMTP id d201mr8631744pfd.54.1588780033112; Wed, 06 May 2020 08:47:13 -0700 (PDT) Received: from localhost.localdomain ([180.70.143.152]) by smtp.gmail.com with ESMTPSA id r21sm4961318pjo.2.2020.05.06.08.47.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 May 2020 08:47:12 -0700 (PDT) From: Taehee Yoo To: davem@davemloft.net, kuba@kernel.org, netdev@vger.kernel.org Cc: ap420073@gmail.com Subject: [PATCH net-next 1/2] hsr: remove incorrect comment Date: Wed, 6 May 2020 15:47:02 +0000 Message-Id: <20200506154702.12432-1-ap420073@gmail.com> X-Mailer: git-send-email 2.17.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The hsr_netdev_notify() deals with hsr master notification event because of debugfs. So, comment for hsr_netdev_notify() is not correct. Signed-off-by: Taehee Yoo --- net/hsr/hsr_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/hsr/hsr_main.c b/net/hsr/hsr_main.c index e2564de67603..332eeb2d9802 100644 --- a/net/hsr/hsr_main.c +++ b/net/hsr/hsr_main.c @@ -127,7 +127,7 @@ struct hsr_port *hsr_port_get_hsr(struct hsr_priv *hsr, enum hsr_port_type pt) } static struct notifier_block hsr_nb = { - .notifier_call = hsr_netdev_notify, /* Slave event notifications */ + .notifier_call = hsr_netdev_notify, }; static int __init hsr_init(void) From patchwork Wed May 6 15:47:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Taehee Yoo X-Patchwork-Id: 1284524 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=FqxmfmOx; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49HLZy104Bz9sV1 for ; Thu, 7 May 2020 01:47:54 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729530AbgEFPrx (ORCPT ); Wed, 6 May 2020 11:47:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34126 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728428AbgEFPrw (ORCPT ); Wed, 6 May 2020 11:47:52 -0400 Received: from mail-pl1-x643.google.com (mail-pl1-x643.google.com [IPv6:2607:f8b0:4864:20::643]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B02F9C061A0F for ; Wed, 6 May 2020 08:47:52 -0700 (PDT) Received: by mail-pl1-x643.google.com with SMTP id s20so644110plp.6 for ; Wed, 06 May 2020 08:47:52 -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; bh=VmVT3hJTHH3yWPGozeeDd4qcjrfr8L+7vkXNizT13wM=; b=FqxmfmOxhqVUJwi2YGsaixJ9xh7Rn+BZYk9kATVWgscLmsjs5Dsf4N4KdHOTBcmAzm RrupuHSFM3ZlVvOwhc3RV6xKxo8Cn7mWNjLedU4lHIjiuBegoXgFnat0lHnY0Ug6dB3a JKtH7zdpdsY5vgNxb2W1m/9QVglii/xukbYiUsDd0mEYzCNjAHdgBkLMcTNifrPU6UjJ AIVnqp9gRIk9uS0XseEx64K3Y1h533QSBi3Br/jpcM9HAJt/LNpXW9bsREg9S84/kZmu RuXUHLksyNshPOPSKCArRZPWz2cL/3HK1I2n2q3bIYd7sMkXDrwkkNGq+K1I26VIW84f 2QIQ== 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; bh=VmVT3hJTHH3yWPGozeeDd4qcjrfr8L+7vkXNizT13wM=; b=haRHP0jRlCxHtbacCHzVkmYoPk123zTyPaGS2FO/DzHvClD7DnKYvrNW5kHaoNR35N +mPiJA+1aBOKpdjcG6qTuyccrJFWEPCwIvX8TDyfJLcbbQonAbe9+N6Mj/8DXqI446SS z56Lz4+XAhvDTO+/KEoFcRed8wngR8vfvhswyDWYNucaxhIgXS2dSst2xx7Q4YyOji71 DSucqVOZh5J3kp7fed38vXq1vPL+5UUcZTCE0OXhgVJWLAo7zCshZqWusR4K4o0NVQew khN+Pm+He+UpjRgrabCiYvKJIaY+AD8NQrccf3XZ+VpMVSfl4Izfw8By03r9cqxV2OVe SJcQ== X-Gm-Message-State: AGi0Pubd/ZF31hdALwfLA9wuAhMLylKitfk2re/fkUbKXCIWWI/ntCHZ 0Ao9RzjrRD4sTZ4BnXLLfcs= X-Google-Smtp-Source: APiQypIs3lOmp251KYNOpWPGGygZwBDsTF8ChXN9L5sCr68S9s4E6tU/AItKMi+05SflzQ21ytg9bA== X-Received: by 2002:a17:90a:ea0b:: with SMTP id w11mr7560569pjy.221.1588780072162; Wed, 06 May 2020 08:47:52 -0700 (PDT) Received: from localhost.localdomain ([180.70.143.152]) by smtp.gmail.com with ESMTPSA id t14sm1920066pgr.61.2020.05.06.08.47.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 May 2020 08:47:51 -0700 (PDT) From: Taehee Yoo To: davem@davemloft.net, kuba@kernel.org, netdev@vger.kernel.org Cc: ap420073@gmail.com Subject: [PATCH net-next 2/2] hsr: remove WARN_ONCE() in hsr_fill_frame_info() Date: Wed, 6 May 2020 15:47:45 +0000 Message-Id: <20200506154745.12627-1-ap420073@gmail.com> X-Mailer: git-send-email 2.17.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When VLAN frame is being sent, hsr calls WARN_ONCE() because hsr doesn't support VLAN. But using WARN_ONCE() is overdoing. Using netdev_warn_once() is enough. Signed-off-by: Taehee Yoo --- net/hsr/hsr_forward.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/hsr/hsr_forward.c b/net/hsr/hsr_forward.c index ddd9605bad04..ed13760463de 100644 --- a/net/hsr/hsr_forward.c +++ b/net/hsr/hsr_forward.c @@ -321,7 +321,7 @@ static int hsr_fill_frame_info(struct hsr_frame_info *frame, if (ethhdr->h_proto == htons(ETH_P_8021Q)) { frame->is_vlan = true; /* FIXME: */ - WARN_ONCE(1, "HSR: VLAN not yet supported"); + netdev_warn_once(skb->dev, "VLAN not yet supported"); } if (ethhdr->h_proto == htons(ETH_P_PRP) || ethhdr->h_proto == htons(ETH_P_HSR)) {