From patchwork Mon Jan 5 22:57:32 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brice Goglin X-Patchwork-Id: 16722 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 DE98FDE3A0 for ; Tue, 6 Jan 2009 09:57:33 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751066AbZAEW5a (ORCPT ); Mon, 5 Jan 2009 17:57:30 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750830AbZAEW53 (ORCPT ); Mon, 5 Jan 2009 17:57:29 -0500 Received: from mailbox2.myri.com ([64.172.73.26]:1808 "EHLO myri.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750823AbZAEW53 (ORCPT ); Mon, 5 Jan 2009 17:57:29 -0500 Received: from [172.31.134.203] (brice-ovpn.sw.myri.com [172.31.134.203]) by myri.com (8.13.7+Sun/8.13.7) with ESMTP id n05MvH7n014274; Mon, 5 Jan 2009 14:57:18 -0800 (PST) Message-ID: <4962905C.1030308@myri.com> Date: Mon, 05 Jan 2009 23:57:32 +0100 From: Brice Goglin User-Agent: Mozilla-Thunderbird 2.0.0.17 (X11/20081018) MIME-Version: 1.0 To: Jeff Garzik , netdev@vger.kernel.org Subject: [PATCH] myri10ge: print MAC and serial number on probe failure X-Enigmail-Version: 0.95.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org To help board identification and diagnosis, print the MAC and serial number on probe failure if they are available. Signed-off-by: Brice Goglin --- 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 --- linux-2.6/drivers/net/myri10ge/myri10ge.c 2008-12-29 08:46:11.000000000 +0100 +++ linux-tmp/drivers/net/myri10ge/myri10ge.c 2009-01-05 23:51:14.000000000 +0100 @@ -75,7 +75,7 @@ #include "myri10ge_mcp.h" #include "myri10ge_mcp_gen_header.h" -#define MYRI10GE_VERSION_STR "1.4.4-1.395" +#define MYRI10GE_VERSION_STR "1.4.4-1.398" MODULE_DESCRIPTION("Myricom 10G driver (10GbE)"); MODULE_AUTHOR("Maintainer: help@myri.com"); @@ -3929,6 +3929,10 @@ myri10ge_dummy_rdma(mgp, 0); abort_with_ioremap: + if (mgp->mac_addr_string != NULL) + dev_err(&pdev->dev, + "myri10ge_probe() failed: MAC=%s, SN=%ld\n", + mgp->mac_addr_string, mgp->serial_number); iounmap(mgp->sram); abort_with_mtrr: