Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 39410
b: refs/heads/master
c: 90f1084
h: refs/heads/master
v: v3
  • Loading branch information
Linas Vepstas authored and Jeff Garzik committed Oct 11, 2006
1 parent ddd2eba commit 62f0aa9
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bff0a55f34e62970203c4af9c8ef4dc7d73e2f96
refs/heads/master: 90f10841180e9b7938f63db69e90dacb7d21bbe5
3 changes: 3 additions & 0 deletions trunk/drivers/net/spider_net.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 2 additions & 0 deletions trunk/drivers/net/spider_net.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/spider_net_ethtool.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down

0 comments on commit 62f0aa9

Please sign in to comment.