From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [NET-NEXT PATCH 3/5] e1000: cleanup link up/down messages
Date: Wed, 26 Nov 2008 16:02:35 -0800 [thread overview]
Message-ID: <20081127000235.22431.40175.stgit@gitlost.lost> (raw)
In-Reply-To: <20081127000206.22431.53339.stgit@gitlost.lost>
The system log messages created on a link status change need to follow a
specific format to work with tools some customers use. This also makes
the messages consistant with other Intel driver link messages.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/e1000/e1000_main.c | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 5c098c9..6494d24 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -2524,10 +2524,11 @@ static void e1000_watchdog(unsigned long data)
&adapter->link_duplex);
ctrl = er32(CTRL);
- DPRINTK(LINK, INFO, "NIC Link is Up %d Mbps %s, "
- "Flow Control: %s\n",
- adapter->link_speed,
- adapter->link_duplex == FULL_DUPLEX ?
+ printk(KERN_INFO "e1000: %s NIC Link is Up %d Mbps %s, "
+ "Flow Control: %s\n",
+ netdev->name,
+ adapter->link_speed,
+ adapter->link_duplex == FULL_DUPLEX ?
"Full Duplex" : "Half Duplex",
((ctrl & E1000_CTRL_TFCE) && (ctrl &
E1000_CTRL_RFCE)) ? "RX/TX" : ((ctrl &
@@ -2603,7 +2604,8 @@ static void e1000_watchdog(unsigned long data)
if (netif_carrier_ok(netdev)) {
adapter->link_speed = 0;
adapter->link_duplex = 0;
- DPRINTK(LINK, INFO, "NIC Link is Down\n");
+ printk(KERN_INFO "e1000: %s NIC Link is Down\n",
+ netdev->name);
netif_carrier_off(netdev);
netif_stop_queue(netdev);
mod_timer(&adapter->phy_info_timer, round_jiffies(jiffies + 2 * HZ));
next prev parent reply other threads:[~2008-11-27 0:02 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-27 0:02 [NET-NEXT PATCH 1/5] igb: link up/down messages must follow a specific format Jeff Kirsher
2008-11-27 0:02 ` [NET-NEXT PATCH 2/5] ixgbe: cleanup link up/down messages Jeff Kirsher
2008-11-27 8:22 ` David Miller
2008-11-27 0:02 ` Jeff Kirsher [this message]
2008-11-27 8:22 ` [NET-NEXT PATCH 3/5] e1000: " David Miller
2008-11-27 0:02 ` [NET-NEXT PATCH 4/5] ixgb: " Jeff Kirsher
2008-11-27 8:23 ` David Miller
2008-11-27 0:03 ` [NET-NEXT PATCH 5/5] e100: " Jeff Kirsher
2008-11-27 8:23 ` David Miller
2008-11-27 8:21 ` [NET-NEXT PATCH 1/5] igb: link up/down messages must follow a specific format David Miller
2008-11-27 10:50 ` Andi Kleen
2008-11-27 11:34 ` David Miller
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=20081127000235.22431.40175.stgit@gitlost.lost \
--to=jeffrey.t.kirsher@intel.com \
--cc=davem@davemloft.net \
--cc=netdev@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;
as well as URLs for NNTP newsgroup(s).