From patchwork Fri Nov 21 19:01:10 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirsher, Jeffrey T" X-Patchwork-Id: 10087 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id D5E4BDDDED for ; Sat, 22 Nov 2008 06:01:33 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753965AbYKUTB3 (ORCPT ); Fri, 21 Nov 2008 14:01:29 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753892AbYKUTB3 (ORCPT ); Fri, 21 Nov 2008 14:01:29 -0500 Received: from qmta09.emeryville.ca.mail.comcast.net ([76.96.30.96]:37833 "EHLO QMTA09.emeryville.ca.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752610AbYKUTB2 (ORCPT ); Fri, 21 Nov 2008 14:01:28 -0500 Received: from OMTA10.emeryville.ca.mail.comcast.net ([76.96.30.28]) by QMTA09.emeryville.ca.mail.comcast.net with comcast id hrxk1a0050cQ2SLA9v1TaH; Fri, 21 Nov 2008 19:01:27 +0000 Received: from gitlost.lost ([63.64.152.142]) by OMTA10.emeryville.ca.mail.comcast.net with comcast id hv1A1a00434bfcX8Wv1CMY; Fri, 21 Nov 2008 19:01:25 +0000 X-Authority-Analysis: v=1.0 c=1 a=wnvGbp4wqHkA:10 a=bfwZNh4EtOAA:10 a=TUBjHkjr0Q472FHwDYcA:9 a=4__TSvKmhQki_kk1PmUA:7 a=JlYDhUukdqtkHQ0SDwN4rPBhxQoA:4 a=dGJ0OcVc7YAA:10 a=iYlkOlhu7C0A:10 From: Jeff Kirsher Subject: [NET-NEXT PATCH 08/14] e1000e: link up/down messages must follow a specific format To: davem@davemloft.net Cc: netdev@vger.kernel.org, jeff@garzik.org, Bruce Allan , Jeff Kirsher Date: Fri, 21 Nov 2008 11:01:10 -0800 Message-ID: <20081121190110.32313.43591.stgit@gitlost.lost> In-Reply-To: <20081121185859.32313.42332.stgit@gitlost.lost> References: <20081121185859.32313.42332.stgit@gitlost.lost> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Bruce Allan The system log messages created on a link status change need to follow a specific format to work with tools some customers use. Signed-off-by: Bruce Allan Signed-off-by: Jeff Kirsher --- drivers/net/e1000e/netdev.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 7eb1a36..cd6d132 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c @@ -3408,7 +3408,10 @@ static void e1000_print_link_info(struct e1000_adapter *adapter) struct e1000_hw *hw = &adapter->hw; u32 ctrl = er32(CTRL); - e_info("Link is Up %d Mbps %s, Flow Control: %s\n", + /* Link status message must follow this format for user tools */ + printk(KERN_INFO "e1000e: %s NIC Link is Up %d Mbps %s, " + "Flow Control: %s\n", + adapter->netdev->name, adapter->link_speed, (adapter->link_duplex == FULL_DUPLEX) ? "Full Duplex" : "Half Duplex", @@ -3618,7 +3621,9 @@ static void e1000_watchdog_task(struct work_struct *work) if (netif_carrier_ok(netdev)) { adapter->link_speed = 0; adapter->link_duplex = 0; - e_info("Link is Down\n"); + /* Link status message must follow this format */ + printk(KERN_INFO "e1000e: %s NIC Link is Down\n", + adapter->netdev->name); netif_carrier_off(netdev); netif_tx_stop_all_queues(netdev); if (!test_bit(__E1000_DOWN, &adapter->state))