From: Joe Perches <joe@perches.com>
To: Ethan Zhao <ethan.kernel@gmail.com>
Cc: "Skidmore, Donald C" <donald.c.skidmore@intel.com>,
Greg KH <gregkh@linuxfoundation.org>,
Bjorn Helgaas <bhelgaas@google.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"e1000-devel@lists.sourceforge.net"
<e1000-devel@lists.sourceforge.net>
Subject: [PATCH] ixgbevf: Fix the debugging output when device is not registered
Date: Sat, 12 Oct 2013 00:11:00 -0700 [thread overview]
Message-ID: <1381561860.8864.5.camel@joe-AO722> (raw)
In-Reply-To: <CABawtvMB9J+wxJNZzROvWcUO4UXMwZxpugCRMEHtk3CPqZLh5Q@mail.gmail.com>
A message can be output with an unidentified eth%d port
when the ixgbevf device is not registered.
ie: ixgbevf: eth%d: ixgbevf_init_interrupt_scheme: etc...
Fix this by using the generic netdev_name() helper
to emit "(unregistered net_device)" instead of "eth%d".
Neaten the format string that emits this too.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index 59a62bb..1b48a55 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -2010,10 +2010,10 @@ static int ixgbevf_init_interrupt_scheme(struct ixgbevf_adapter *adapter)
goto err_alloc_queues;
}
- hw_dbg(&adapter->hw, "Multiqueue %s: Rx Queue count = %u, "
- "Tx Queue count = %u\n",
- (adapter->num_rx_queues > 1) ? "Enabled" :
- "Disabled", adapter->num_rx_queues, adapter->num_tx_queues);
+ hw_dbg(&adapter->hw,
+ "Multiqueue %s: Rx Queue count = %u, Tx Queue count = %u\n",
+ (adapter->num_rx_queues > 1) ? "Enabled" : "Disabled",
+ adapter->num_rx_queues, adapter->num_tx_queues);
set_bit(__IXGBEVF_DOWN, &adapter->state);
@@ -3645,7 +3645,7 @@ static void __exit ixgbevf_exit_module(void)
char *ixgbevf_get_hw_dev_name(struct ixgbe_hw *hw)
{
struct ixgbevf_adapter *adapter = hw->back;
- return adapter->netdev->name;
+ return netdev_name(adapter->netdev);
}
#endif
next prev parent reply other threads:[~2013-10-12 7:11 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1381460298-1097-1-git-send-email-ethan.kernel@gmail.com>
2013-10-11 15:35 ` [PATCH] drivers/base/core.c: always output device renaming messages Greg KH
2013-10-11 16:08 ` Bjorn Helgaas
2013-10-11 16:12 ` Greg KH
[not found] ` <F6FB0E698C9B3143BDF729DF222866466FD67CA7@ORSMSX110.amr.corp.intel.com>
2013-10-12 6:55 ` Ethan Zhao
2013-10-12 7:11 ` Joe Perches [this message]
2013-10-12 7:03 ` Ethan Zhao
2013-10-12 6:52 ` Ethan Zhao
2013-10-12 17:50 ` Greg KH
2013-10-13 1:34 ` Ethan Zhao
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=1381561860.8864.5.camel@joe-AO722 \
--to=joe@perches.com \
--cc=bhelgaas@google.com \
--cc=donald.c.skidmore@intel.com \
--cc=e1000-devel@lists.sourceforge.net \
--cc=ethan.kernel@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.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
all inboxes | Powered by JetHome®