Browse Source

[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>
Linas Vepstas 18 years ago
parent
commit
90f1084118
3 changed files with 6 additions and 1 deletions
  1. 3 0
      drivers/net/spider_net.c
  2. 2 0
      drivers/net/spider_net.h
  3. 1 1
      drivers/net/spider_net_ethtool.c

+ 3 - 0
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>");
 	      "<Jens.Osterkamp@de.ibm.com>");
 MODULE_DESCRIPTION("Spider Southbridge Gigabit Ethernet driver");
 MODULE_DESCRIPTION("Spider Southbridge Gigabit Ethernet driver");
 MODULE_LICENSE("GPL");
 MODULE_LICENSE("GPL");
+MODULE_VERSION(VERSION);
 
 
 static int rx_descriptors = SPIDER_NET_RX_DESCRIPTORS_DEFAULT;
 static int rx_descriptors = SPIDER_NET_RX_DESCRIPTORS_DEFAULT;
 static int tx_descriptors = SPIDER_NET_TX_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)
 static int __init spider_net_init(void)
 {
 {
+	printk(KERN_INFO "Spidernet version %s.\n", VERSION);
+
 	if (rx_descriptors < SPIDER_NET_RX_DESCRIPTORS_MIN) {
 	if (rx_descriptors < SPIDER_NET_RX_DESCRIPTORS_MIN) {
 		rx_descriptors = SPIDER_NET_RX_DESCRIPTORS_MIN;
 		rx_descriptors = SPIDER_NET_RX_DESCRIPTORS_MIN;
 		pr_info("adjusting rx descriptors to %i.\n", rx_descriptors);
 		pr_info("adjusting rx descriptors to %i.\n", rx_descriptors);

+ 2 - 0
drivers/net/spider_net.h

@@ -24,6 +24,8 @@
 #ifndef _SPIDER_NET_H
 #ifndef _SPIDER_NET_H
 #define _SPIDER_NET_H
 #define _SPIDER_NET_H
 
 
+#define VERSION "1.1 A"
+
 #include "sungem_phy.h"
 #include "sungem_phy.h"
 
 
 extern int spider_net_stop(struct net_device *netdev);
 extern int spider_net_stop(struct net_device *netdev);

+ 1 - 1
drivers/net/spider_net_ethtool.c

@@ -76,7 +76,7 @@ spider_net_ethtool_get_drvinfo(struct net_device *netdev,
 	/* clear and fill out info */
 	/* clear and fill out info */
 	memset(drvinfo, 0, sizeof(struct ethtool_drvinfo));
 	memset(drvinfo, 0, sizeof(struct ethtool_drvinfo));
 	strncpy(drvinfo->driver, spider_net_driver_name, 32);
 	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");
 	strcpy(drvinfo->fw_version, "no information");
 	strncpy(drvinfo->bus_info, pci_name(card->pdev), 32);
 	strncpy(drvinfo->bus_info, pci_name(card->pdev), 32);
 }
 }