summaryrefslogtreecommitdiffstats
path: root/drivers/net/3c509.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/3c509.c')
-rw-r--r--drivers/net/3c509.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/3c509.c b/drivers/net/3c509.c
index febe4b514..bb9ee3c30 100644
--- a/drivers/net/3c509.c
+++ b/drivers/net/3c509.c
@@ -34,7 +34,7 @@ static char *version = "3c509.c:1.07 6/15/95 becker@cesdis.gsfc.nasa.gov\n";
#include <linux/module.h>
-#include <linux/config.h>
+#include <linux/config.h> /* for CONFIG_MCA */
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/string.h>
@@ -47,7 +47,6 @@ static char *version = "3c509.c:1.07 6/15/95 becker@cesdis.gsfc.nasa.gov\n";
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <linux/skbuff.h>
-#include <linux/config.h> /* for CONFIG_MCA */
#include <linux/delay.h> /* for udelay() */
#include <linux/init.h>
@@ -548,7 +547,7 @@ static int el3_start_xmit(struct sk_buff *skb, struct device *dev)
outw(SetTxThreshold + 1536, ioaddr + EL3_CMD);
}
- dev_kfree_skb (skb, FREE_WRITE);
+ dev_kfree_skb (skb);
/* Clear the Tx status stack. */
{
@@ -864,11 +863,11 @@ cleanup_module(void)
for (this_dev = 0; this_dev < MAX_3C_CARDS; this_dev++) {
struct device *dev = &dev_3c509[this_dev];
if (dev->priv != NULL) {
+ unregister_netdev(dev);
kfree_s(dev->priv,sizeof(struct el3_private));
dev->priv = NULL;
free_irq(dev->irq, dev);
release_region(dev->base_addr, EL3_IO_EXTENT);
- unregister_netdev(dev);
}
}
}