lkml.org 
[lkml]   [2006]   [Oct]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Subject[PATCH 1/21]: powerpc/cell spidernet ethtool -i version number info.
    From

    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>

    ----
    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 <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;
    @@ -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);
    }
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2006-10-10 22:59    [W:0.027 / U:29.744 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site