Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Automatic merge of /spare/repo/netdev-2.6 branch pcnet32
authored by and committed by Jeff Garzik a58eae64 09e62666
+5
-2
drivers/net/pcnet32.c
+5
-2
drivers/net/pcnet32.c
···
22
22
*************************************************************************/
23
23
24
24
#define DRV_NAME "pcnet32"
25
-
#define DRV_VERSION "1.30i"
26
-
#define DRV_RELDATE "06.28.2004"
25
+
#define DRV_VERSION "1.30j"
26
+
#define DRV_RELDATE "29.04.2005"
27
27
#define PFX DRV_NAME ": "
28
28
29
29
static const char *version =
···
256
256
* homepna for selecting HomePNA mode for PCNet/Home 79C978.
257
257
* v1.30h 24 Jun 2004 Don Fry correctly select auto, speed, duplex in bcr32.
258
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
···
396
395
static int pcnet32_get_regs_len(struct net_device *dev);
397
396
static void pcnet32_get_regs(struct net_device *dev, struct ethtool_regs *regs,
398
397
void *ptr);
398
+
static void pcnet32_purge_tx_ring(struct net_device *dev);
399
399
400
400
enum pci_flags_bit {
401
401
PCI_USES_IO=1, PCI_USES_MEM=2, PCI_USES_MASTER=4,
···
787
785
}
788
786
789
787
clean_up:
788
+
pcnet32_purge_tx_ring(dev);
790
789
x = a->read_csr(ioaddr, 15) & 0xFFFF;
791
790
a->write_csr(ioaddr, 15, (x & ~0x0044)); /* reset bits 6 and 2 */
792
791