diff options
author | <jgarzik@pretzel.yyz.us> | 2005-05-25 13:57:25 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-25 13:57:25 -0400 |
commit | a58eae6480f354595c3954534e1ab591dc3ef1bf (patch) | |
tree | d73d9905ccb224c09c41a2ebebf08b29fa90eb7a | |
parent | 09e62666d8a6312426f96bf483cdb003bde556fe (diff) | |
parent | 1bcd315362e215a72b56d1330bbf32f1c74eefb5 (diff) |
Automatic merge of /spare/repo/netdev-2.6 branch pcnet32
-rw-r--r-- | drivers/net/pcnet32.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c index 17947e6c8793..13f114876965 100644 --- a/drivers/net/pcnet32.c +++ b/drivers/net/pcnet32.c | |||
@@ -22,8 +22,8 @@ | |||
22 | *************************************************************************/ | 22 | *************************************************************************/ |
23 | 23 | ||
24 | #define DRV_NAME "pcnet32" | 24 | #define DRV_NAME "pcnet32" |
25 | #define DRV_VERSION "1.30i" | 25 | #define DRV_VERSION "1.30j" |
26 | #define DRV_RELDATE "06.28.2004" | 26 | #define DRV_RELDATE "29.04.2005" |
27 | #define PFX DRV_NAME ": " | 27 | #define PFX DRV_NAME ": " |
28 | 28 | ||
29 | static const char *version = | 29 | static const char *version = |
@@ -256,6 +256,7 @@ static int homepna[MAX_UNITS]; | |||
256 | * homepna for selecting HomePNA mode for PCNet/Home 79C978. | 256 | * homepna for selecting HomePNA mode for PCNet/Home 79C978. |
257 | * v1.30h 24 Jun 2004 Don Fry correctly select auto, speed, duplex in bcr32. | 257 | * v1.30h 24 Jun 2004 Don Fry correctly select auto, speed, duplex in bcr32. |
258 | * v1.30i 28 Jun 2004 Don Fry change to use module_param. | 258 | * v1.30i 28 Jun 2004 Don Fry change to use module_param. |
259 | * v1.30j 29 Apr 2005 Don Fry fix skb/map leak with loopback test. | ||
259 | */ | 260 | */ |
260 | 261 | ||
261 | 262 | ||
@@ -395,6 +396,7 @@ static void pcnet32_led_blink_callback(struct net_device *dev); | |||
395 | static int pcnet32_get_regs_len(struct net_device *dev); | 396 | static int pcnet32_get_regs_len(struct net_device *dev); |
396 | static void pcnet32_get_regs(struct net_device *dev, struct ethtool_regs *regs, | 397 | static void pcnet32_get_regs(struct net_device *dev, struct ethtool_regs *regs, |
397 | void *ptr); | 398 | void *ptr); |
399 | static void pcnet32_purge_tx_ring(struct net_device *dev); | ||
398 | 400 | ||
399 | enum pci_flags_bit { | 401 | enum pci_flags_bit { |
400 | PCI_USES_IO=1, PCI_USES_MEM=2, PCI_USES_MASTER=4, | 402 | PCI_USES_IO=1, PCI_USES_MEM=2, PCI_USES_MASTER=4, |
@@ -785,6 +787,7 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t *data1) | |||
785 | } | 787 | } |
786 | 788 | ||
787 | clean_up: | 789 | clean_up: |
790 | pcnet32_purge_tx_ring(dev); | ||
788 | x = a->read_csr(ioaddr, 15) & 0xFFFF; | 791 | x = a->read_csr(ioaddr, 15) & 0xFFFF; |
789 | a->write_csr(ioaddr, 15, (x & ~0x0044)); /* reset bits 6 and 2 */ | 792 | a->write_csr(ioaddr, 15, (x & ~0x0044)); /* reset bits 6 and 2 */ |
790 | 793 | ||