From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from e31.co.us.ibm.com (e31.co.us.ibm.com [32.97.110.149]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "e31.co.us.ibm.com", Issuer "Equifax" (verified OK)) by ozlabs.org (Postfix) with ESMTP id 5964767BE2 for ; Wed, 11 Oct 2006 06:56:07 +1000 (EST) Received: from westrelay02.boulder.ibm.com (westrelay02.boulder.ibm.com [9.17.195.11]) by e31.co.us.ibm.com (8.13.8/8.12.11) with ESMTP id k9AKu5L3029595 for ; Tue, 10 Oct 2006 16:56:05 -0400 Received: from d03av04.boulder.ibm.com (d03av04.boulder.ibm.com [9.17.195.170]) by westrelay02.boulder.ibm.com (8.13.6/8.13.6/NCO v8.1.1) with ESMTP id k9AKu5Rs530658 for ; Tue, 10 Oct 2006 14:56:05 -0600 Received: from d03av04.boulder.ibm.com (loopback [127.0.0.1]) by d03av04.boulder.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id k9AKu4nQ030577 for ; Tue, 10 Oct 2006 14:56:04 -0600 Date: Tue, 10 Oct 2006 15:56:04 -0500 To: akpm@osdl.org Subject: [PATCH 1/21]: powerpc/cell spidernet ethtool -i version number info. Message-ID: <20061010205603.GX4381@austin.ibm.com> References: <20061010204946.GW4381@austin.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <20061010204946.GW4381@austin.ibm.com> From: linas@austin.ibm.com (Linas Vepstas) Cc: jeff@garzik.org, Arnd Bergmann , netdev@vger.kernel.org, James K Lewis , linux-kernel@vger.kernel.org, linuxppc-dev@ozlabs.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , This patch adds version information as reported by ethtool -i to the Spidernet driver. From: James K Lewis Signed-off-by: James K Lewis Signed-off-by: Linas Vepstas Acked-by: Arnd Bergmann ---- drivers/net/spider_net.c | 3 +++ drivers/net/spider_net.h | 2 ++ drivers/net/spider_net_ethtool.c | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) Index: linux-2.6.18-mm2/drivers/net/spider_net.c =================================================================== --- linux-2.6.18-mm2.orig/drivers/net/spider_net.c 2006-10-05 11:12:44.000000000 -0500 +++ linux-2.6.18-mm2/drivers/net/spider_net.c 2006-10-05 11:14:33.000000000 -0500 @@ -55,6 +55,7 @@ MODULE_AUTHOR("Utz Bacher "); MODULE_DESCRIPTION("Spider Southbridge Gigabit Ethernet driver"); MODULE_LICENSE("GPL"); +MODULE_VERSION(VERSION); static int rx_descriptors = SPIDER_NET_RX_DESCRIPTORS_DEFAULT; static int tx_descriptors = SPIDER_NET_TX_DESCRIPTORS_DEFAULT; @@ -2252,6 +2253,8 @@ static struct pci_driver spider_net_driv */ static int __init spider_net_init(void) { + printk(KERN_INFO "Spidernet version %s.\n", VERSION); + if (rx_descriptors < SPIDER_NET_RX_DESCRIPTORS_MIN) { rx_descriptors = SPIDER_NET_RX_DESCRIPTORS_MIN; pr_info("adjusting rx descriptors to %i.\n", rx_descriptors); Index: linux-2.6.18-mm2/drivers/net/spider_net.h =================================================================== --- linux-2.6.18-mm2.orig/drivers/net/spider_net.h 2006-10-05 11:13:53.000000000 -0500 +++ linux-2.6.18-mm2/drivers/net/spider_net.h 2006-10-05 11:14:33.000000000 -0500 @@ -24,6 +24,8 @@ #ifndef _SPIDER_NET_H #define _SPIDER_NET_H +#define VERSION "1.1 A" + #include "sungem_phy.h" extern int spider_net_stop(struct net_device *netdev); Index: linux-2.6.18-mm2/drivers/net/spider_net_ethtool.c =================================================================== --- linux-2.6.18-mm2.orig/drivers/net/spider_net_ethtool.c 2006-10-05 11:12:44.000000000 -0500 +++ linux-2.6.18-mm2/drivers/net/spider_net_ethtool.c 2006-10-05 11:14:33.000000000 -0500 @@ -76,7 +76,7 @@ spider_net_ethtool_get_drvinfo(struct ne /* clear and fill out info */ memset(drvinfo, 0, sizeof(struct ethtool_drvinfo)); strncpy(drvinfo->driver, spider_net_driver_name, 32); - strncpy(drvinfo->version, "0.1", 32); + strncpy(drvinfo->version, VERSION, 32); strcpy(drvinfo->fw_version, "no information"); strncpy(drvinfo->bus_info, pci_name(card->pdev), 32); }