diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-03-09 20:33:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-03-09 20:33:35 +0000 |
| commit | 116674acc97ba75a720329996877077d988443a2 (patch) | |
| tree | 6a3f2ff0b612ae2ee8a3f3509370c9e6333a53b3 /drivers/net/pcmcia/nmclan_cs.c | |
| parent | 71118c319fcae4a138f16e35b4f7e0a6d53ce2ca (diff) | |
Merge with Linux 2.4.2.
Diffstat (limited to 'drivers/net/pcmcia/nmclan_cs.c')
| -rw-r--r-- | drivers/net/pcmcia/nmclan_cs.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c index 0dccc399c..9b7f8f048 100644 --- a/drivers/net/pcmcia/nmclan_cs.c +++ b/drivers/net/pcmcia/nmclan_cs.c @@ -4,13 +4,13 @@ Linux PCMCIA ethernet adapter driver for the New Media Ethernet LAN. The Ethernet LAN uses the Advanced Micro Devices (AMD) Am79C940 Media Access Controller for Ethernet (MACE). It is essentially the Am2150 - PCMCIA Ethernet card contained in the the Am2150 Demo Kit. + PCMCIA Ethernet card contained in the Am2150 Demo Kit. Written by Roger C. Pao <rpao@paonet.org> Copyright 1995 Roger C. Pao This software may be used and distributed according to the terms of - the GNU Public License. + the GNU General Public License. Ported to Linux 1.3.* network driver environment by Matti Aarnio <mea@utu.fi> @@ -124,7 +124,7 @@ Include Files #include <linux/init.h> #include <linux/sched.h> #include <linux/ptrace.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/string.h> #include <linux/timer.h> #include <linux/interrupt.h> @@ -515,8 +515,10 @@ static dev_link_t *nmclan_attach(void) ether_setup(dev); dev->open = &mace_open; dev->stop = &mace_close; +#ifdef HAVE_TX_TIMEOUT dev->tx_timeout = mace_tx_timeout; dev->watchdog_timeo = TX_TIMEOUT; +#endif /* Register with Card Services */ link->next = dev_list; @@ -1023,7 +1025,7 @@ static void mace_tx_timeout(struct net_device *dev) printk("NOT resetting card\n"); #endif /* #if RESET_ON_TIMEOUT */ dev->trans_start = jiffies; - netif_start_queue(dev); + netif_wake_queue(dev); } static int mace_start_xmit(struct sk_buff *skb, struct net_device *dev) |