[PATCH 5/12] [NET] Bring declance.c in sync with linux-mips tree

Martin Michlmayr
2006-03-20T04:40:29Z

There are three changes between the Linus' and linux-mips git trees
regarding the declaner driver. Two are cosmetic and one fixes a
call to the wrong function.

Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
Acked-by: Maciej W. Rozycki <macro@linux-mips.org>

--- linux-2.6/drivers/net/declance.c 2006-03-05 19:35:04.000000000 +0000
+++ mips.git/drivers/net/declance.c 2006-03-05 18:51:15.000000000 +0000
@@ -704,8 +704,8 @@
return IRQ_HANDLED;
}

-static irqreturn_t
-lance_interrupt(const int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t lance_interrupt(const int irq, void *dev_id,
+ struct pt_regs *regs)
{
struct net_device *dev = (struct net_device *) dev_id;
struct lance_private *lp = netdev_priv(dev);
@@ -1255,7 +1255,7 @@
return 0;

err_out_free_dev:
- kfree(dev);
+ free_netdev(dev);

err_out:
return ret;
@@ -1301,6 +1301,7 @@
while (root_lance_dev) {
struct net_device *dev = root_lance_dev;
struct lance_private *lp = netdev_priv(dev);
+
unregister_netdev(dev);
#ifdef CONFIG_TC
if (lp->slot >= 0)