diff options
| author | Linas Vepstas <linas@austin.ibm.com> | 2006-10-10 15:56:04 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 04:04:24 -0400 |
| commit | 90f10841180e9b7938f63db69e90dacb7d21bbe5 (patch) | |
| tree | 75f99aad7065cd3562e3516a337df72f84391e0c /drivers | |
| parent | bff0a55f34e62970203c4af9c8ef4dc7d73e2f96 (diff) | |
| download | linux-stable-90f10841180e9b7938f63db69e90dacb7d21bbe5.tar.gz linux-stable-90f10841180e9b7938f63db69e90dacb7d21bbe5.tar.bz2 linux-stable-90f10841180e9b7938f63db69e90dacb7d21bbe5.zip | |
[PATCH] powerpc/cell spidernet ethtool -i version number info.
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>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/spider_net.c | 3 | ||||
| -rw-r--r-- | drivers/net/spider_net.h | 2 | ||||
| -rw-r--r-- | drivers/net/spider_net_ethtool.c | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c index 46a009085f7c..96dafb0f563d 100644 --- a/drivers/net/spider_net.c +++ b/drivers/net/spider_net.c @@ -55,6 +55,7 @@ MODULE_AUTHOR("Utz Bacher <utz.bacher@de.ibm.com> and Jens Osterkamp " \ "<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; @@ -2252,6 +2253,8 @@ static struct pci_driver spider_net_driver = { */ 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); diff --git a/drivers/net/spider_net.h b/drivers/net/spider_net.h index a59deda2f95e..6193ea836289 100644 --- a/drivers/net/spider_net.h +++ b/drivers/net/spider_net.h @@ -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); diff --git a/drivers/net/spider_net_ethtool.c b/drivers/net/spider_net_ethtool.c index 589e43658dee..fda74f7d6fd6 100644 --- a/drivers/net/spider_net_ethtool.c +++ b/drivers/net/spider_net_ethtool.c @@ -76,7 +76,7 @@ spider_net_ethtool_get_drvinfo(struct net_device *netdev, /* 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); } |