From: linas@austin.ibm.com (Linas Vepstas)
To: Jeff Garzik <jgarzik@pobox.com>
Cc: akpm@osdl.org, Arnd Bergmann <arnd@arndb.de>,
netdev@vger.kernel.org, James K Lewis <jklewis@us.ibm.com>,
linux-kernel@vger.kernel.org, linuxppc-dev@ozlabs.org,
ens Osterkamp <Jens.Osterkamp@de.ibm.com>
Subject: [PATCH 4/6]: powerpc/cell spidernet ethtool -i version number info.
Date: Fri, 18 Aug 2006 17:25:00 -0500 [thread overview]
Message-ID: <20060818222500.GK26889@austin.ibm.com> (raw)
In-Reply-To: <20060818220700.GG26889@austin.ibm.com>
This patch adds version information as reported by
ethtool -i to the Spidernet driver.
From: James K Lewis <jklewis@us.ibm.com>
Signed-off-by: James K Lewis <jklewis@us.ibm.com>
Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Cc: Utz Bacher <utz.bacher@de.ibm.com>
Cc: Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
----
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-rc3-mm2/drivers/net/spider_net.c
===================================================================
--- linux-2.6.18-rc3-mm2.orig/drivers/net/spider_net.c 2006-08-11 11:34:16.000000000 -0500
+++ linux-2.6.18-rc3-mm2/drivers/net/spider_net.c 2006-08-11 11:38:48.000000000 -0500
@@ -55,6 +55,7 @@ MODULE_AUTHOR("Utz Bacher <utz.bacher@de
"<Jens.Osterkamp@de.ibm.com>");
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;
@@ -2293,6 +2294,8 @@ static struct pci_driver spider_net_driv
*/
static int __init spider_net_init(void)
{
+ printk("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-rc3-mm2/drivers/net/spider_net.h
===================================================================
--- linux-2.6.18-rc3-mm2.orig/drivers/net/spider_net.h 2006-08-11 11:19:47.000000000 -0500
+++ linux-2.6.18-rc3-mm2/drivers/net/spider_net.h 2006-08-11 11:38:48.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-rc3-mm2/drivers/net/spider_net_ethtool.c
===================================================================
--- linux-2.6.18-rc3-mm2.orig/drivers/net/spider_net_ethtool.c 2006-06-17 20:49:35.000000000 -0500
+++ linux-2.6.18-rc3-mm2/drivers/net/spider_net_ethtool.c 2006-08-11 11:38:48.000000000 -0500
@@ -55,7 +55,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);
}
next prev parent reply other threads:[~2006-08-18 22:25 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-08-18 22:07 [PATCH 0/6]: powerpc/cell spidernet ethernet driver update Linas Vepstas
2006-08-18 22:20 ` [PATCH 1/6]: powerpc/cell spidernet burst alignment patch Linas Vepstas
2006-08-18 22:51 ` Arnd Bergmann
2006-08-18 22:21 ` [PATCH 2/6]: powerpc/cell spidernet low watermark patch Linas Vepstas
2006-08-18 23:09 ` Arnd Bergmann
2006-08-20 6:31 ` Benjamin Herrenschmidt
2006-08-20 10:03 ` Arnd Bergmann
2006-08-23 21:36 ` Linas Vepstas
2006-08-23 22:03 ` David Miller
2006-08-18 22:23 ` [PATCH 3/6]: powerpc/cell spidernet stop error printing patch Linas Vepstas
2006-08-18 22:25 ` Linas Vepstas [this message]
2006-08-18 22:56 ` [PATCH 4/6]: powerpc/cell spidernet ethtool -i version number info Arnd Bergmann
2006-08-18 22:26 ` [PATCH 5/6]: powerpc/cell spidernet bottom half Linas Vepstas
2006-08-18 23:03 ` Arnd Bergmann
2006-08-19 0:56 ` [RFC] HOWTO use NAPI to reduce TX interrupts Arnd Bergmann
2006-08-20 1:31 ` Stephen Hemminger
2006-08-19 11:25 ` Arnd Bergmann
2006-08-20 17:48 ` [RFC v2] " Arnd Bergmann
2006-08-21 20:40 ` NAPI documentation Stephen Hemminger
2006-08-21 22:05 ` David Miller
2006-08-21 22:09 ` Stephen Hemminger
2006-08-21 22:17 ` David Miller
2006-08-21 23:52 ` [RFC] HOWTO use NAPI to reduce TX interrupts Linas Vepstas
2006-08-21 23:56 ` David Miller
2006-08-22 0:29 ` Roland Dreier
2006-08-22 0:32 ` David Miller
2006-08-23 1:29 ` Shirley Ma
2006-08-23 21:52 ` [PATCH 5/6]: powerpc/cell spidernet bottom half Linas Vepstas
2006-08-18 22:29 ` [PATCH 6/6]: powerpc/cell spidernet refine locking Linas Vepstas
-- strict thread matches above, loose matches on Subject: below --
2006-09-29 23:05 [PATCH 0/6]: powerpc/cell spidernet ethernet patches Linas Vepstas
2006-09-29 23:21 ` [PATCH 4/6]: powerpc/cell spidernet ethtool -i version number info Linas Vepstas
2006-09-30 10:33 ` Arnd Bergmann
2006-10-02 17:14 ` Linas Vepstas
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=20060818222500.GK26889@austin.ibm.com \
--to=linas@austin.ibm.com \
--cc=Jens.Osterkamp@de.ibm.com \
--cc=akpm@osdl.org \
--cc=arnd@arndb.de \
--cc=jgarzik@pobox.com \
--cc=jklewis@us.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@ozlabs.org \
--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).