The patch titled
powerpc/cell spidernet ethtool -i version number info
has been added to the -mm tree. Its filename is
powerpc-cell-spidernet-ethtool-i-version-number-info.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: powerpc/cell spidernet ethtool -i version number info
From: Linas Vepstas <linas@xxxxxxxxxxxxxx>
This patch adds version information as reported by ethtool -i to the Spidernet
driver.
Signed-off-by: James K Lewis <jklewis@xxxxxxxxxx>
Signed-off-by: Linas Vepstas <linas@xxxxxxxxxxxxxx>
Cc: Arnd Bergmann <arnd@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
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(-)
diff -puN drivers/net/spider_net.c~powerpc-cell-spidernet-ethtool-i-version-number-info drivers/net/spider_net.c
--- a/drivers/net/spider_net.c~powerpc-cell-spidernet-ethtool-i-version-number-info
+++ a/drivers/net/spider_net.c
@@ -55,6 +55,7 @@ MODULE_AUTHOR("Utz Bacher <utz.bacher@de
"<Jens.Osterkamp@xxxxxxxxxx>");
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;
@@ -2303,6 +2304,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);
diff -puN drivers/net/spider_net.h~powerpc-cell-spidernet-ethtool-i-version-number-info drivers/net/spider_net.h
--- a/drivers/net/spider_net.h~powerpc-cell-spidernet-ethtool-i-version-number-info
+++ a/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 -puN drivers/net/spider_net_ethtool.c~powerpc-cell-spidernet-ethtool-i-version-number-info drivers/net/spider_net_ethtool.c
--- a/drivers/net/spider_net_ethtool.c~powerpc-cell-spidernet-ethtool-i-version-number-info
+++ a/drivers/net/spider_net_ethtool.c
@@ -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);
}
_
Patches currently in -mm which might be from linas@xxxxxxxxxxxxxx are
origin.patch
git-netdev-all.patch
powerpc-cell-spidernet-burst-alignment-patch.patch
powerpc-cell-spidernet-low-watermark-patch.patch
powerpc-cell-spidernet-stop-error-printing-patch.patch
powerpc-cell-spidernet-ethtool-i-version-number-info.patch
powerpc-cell-spidernet-ethtool-i-version-number.patch
powerpc-cell-spidernet-refine-locking.patch
git-powerpc.patch
pci-error-recovery-symbios-scsi-device-driver.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
