From: "Enrico Weigelt, metux IT consult" <info@metux.net>
To: linux-kernel@vger.kernel.org
Cc: davem@davemloft.net, mareklindner@neomailbox.ch,
sw@simonwunderlich.de, a@unstable.cc, sven@narfation.org,
marcel@holtmann.org, johan.hedberg@gmail.com,
roopa@cumulusnetworks.com, nikolay@cumulusnetworks.com,
edumazet@google.com, kuznet@ms2.inr.ac.ru,
yoshfuji@linux-ipv6.org, jon.maloy@ericsson.com,
ying.xue@windriver.com, kafai@fb.com, songliubraving@fb.com,
yhs@fb.com, andriin@fb.com, netdev@vger.kernel.org,
linux-bluetooth@vger.kernel.org,
tipc-discussion@lists.sourceforge.net,
linux-hyperv@vger.kernel.org, bpf@vger.kernel.org
Subject: [PATCH 2/8] net: 8021q: use netdev_info()/netdev_warn()
Date: Sat, 4 Jan 2020 20:51:25 +0100 [thread overview]
Message-ID: <20200104195131.16577-2-info@metux.net> (raw)
In-Reply-To: <20200104195131.16577-1-info@metux.net>
Use netdev_info() / netdev_warn() instead of pr_info() / pr_warn()
for more consistent log output.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
net/8021q/vlan.c | 4 ++--
net/8021q/vlan_core.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index ded7bf7229cf..7f18c8406ff8 100644
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -123,7 +123,7 @@ int vlan_check_real_dev(struct net_device *real_dev,
const char *name = real_dev->name;
if (real_dev->features & NETIF_F_VLAN_CHALLENGED) {
- pr_info("VLANs not supported on %s\n", name);
+ netdev_info(real_dev, "VLANs not supported on %s\n", name);
NL_SET_ERR_MSG_MOD(extack, "VLANs not supported on device");
return -EOPNOTSUPP;
}
@@ -376,7 +376,7 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event,
if ((event == NETDEV_UP) &&
(dev->features & NETIF_F_HW_VLAN_CTAG_FILTER)) {
- pr_info("adding VLAN 0 to HW filter on device %s\n",
+ netdev_info(dev, "adding VLAN 0 to HW filter on device %s\n",
dev->name);
vlan_vid_add(dev, htons(ETH_P_8021Q), 0);
}
diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c
index a313165e7a67..bc32b33e0da8 100644
--- a/net/8021q/vlan_core.c
+++ b/net/8021q/vlan_core.c
@@ -360,7 +360,7 @@ static void __vlan_vid_del(struct vlan_info *vlan_info,
err = vlan_kill_rx_filter_info(dev, proto, vid);
if (err)
- pr_warn("failed to kill vid %04x/%d for device %s\n",
+ netdev_warn(dev, "failed to kill vid %04x/%d for device %s\n",
proto, vid, dev->name);
list_del(&vid_info->list);
--
2.11.0
next prev parent reply other threads:[~2020-01-04 19:53 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-04 19:51 [PATCH 1/8] net: 8021q: remove unneeded MODULE_VERSION() usage Enrico Weigelt, metux IT consult
2020-01-04 19:51 ` Enrico Weigelt, metux IT consult [this message]
2020-01-04 20:06 ` [PATCH 2/8] net: 8021q: use netdev_info()/netdev_warn() Florian Fainelli
2020-01-04 19:51 ` [PATCH 3/8] net: batman-adv: remove unneeded MODULE_VERSION() usage Enrico Weigelt, metux IT consult
2020-01-04 19:59 ` Sven Eckelmann
2020-01-04 19:51 ` [PATCH 4/8] net: ipv4: use netdev_info()/netdev_warn() Enrico Weigelt, metux IT consult
2020-01-04 19:55 ` Sven Eckelmann
2020-01-04 19:56 ` Fabio Estevam
2020-01-04 19:51 ` [PATCH 5/8] net: bluetooth: remove unneeded MODULE_VERSION() usage Enrico Weigelt, metux IT consult
2020-01-05 9:34 ` Marcel Holtmann
2020-01-05 10:42 ` Greg KH
2020-01-04 19:51 ` [PATCH 6/8] net: bridge: " Enrico Weigelt, metux IT consult
2020-01-04 19:51 ` [PATCH 7/8] net: vmw_vsock: " Enrico Weigelt, metux IT consult
2020-01-04 19:51 ` [PATCH 8/8] net: tipc: " Enrico Weigelt, metux IT consult
2020-01-05 2:40 ` [PATCH 1/8] net: 8021q: " kbuild test robot
2020-01-05 5:56 ` kbuild test robot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200104195131.16577-2-info@metux.net \
--to=info@metux.net \
--cc=a@unstable.cc \
--cc=andriin@fb.com \
--cc=bpf@vger.kernel.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=johan.hedberg@gmail.com \
--cc=jon.maloy@ericsson.com \
--cc=kafai@fb.com \
--cc=kuznet@ms2.inr.ac.ru \
--cc=linux-bluetooth@vger.kernel.org \
--cc=linux-hyperv@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marcel@holtmann.org \
--cc=mareklindner@neomailbox.ch \
--cc=netdev@vger.kernel.org \
--cc=nikolay@cumulusnetworks.com \
--cc=roopa@cumulusnetworks.com \
--cc=songliubraving@fb.com \
--cc=sven@narfation.org \
--cc=sw@simonwunderlich.de \
--cc=tipc-discussion@lists.sourceforge.net \
--cc=yhs@fb.com \
--cc=ying.xue@windriver.com \
--cc=yoshfuji@linux-ipv6.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).