From: Martin Michlmayr <tbm@cyrius.com>
To: akpm@osdl.org
Cc: linux-kernel@vger.kernel.org, linux-mips@linux-mips.org,
netdev@vger.kernel.org
Subject: [PATCH 5/12] [NET] Bring declance.c in sync with linux-mips tree
Date: Mon, 20 Mar 2006 04:39:53 +0000 [thread overview]
Message-ID: <20060320043953.GE20416@deprecation.cyrius.com> (raw)
In-Reply-To: <20060320043802.GA20389@deprecation.cyrius.com>
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)
--
Martin Michlmayr
http://www.cyrius.com/
next prev parent reply other threads:[~2006-03-20 4:39 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20060320043802.GA20389@deprecation.cyrius.com>
2006-03-20 4:39 ` [PATCH 4/12] [NET] Improve description of MV643XX_ETH Martin Michlmayr
2006-03-20 4:39 ` Martin Michlmayr [this message]
2006-03-20 4:40 ` [PATCH 6/12] [NET] Support the BCM1x55 and BCM1x80 chips Martin Michlmayr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060320043953.GE20416@deprecation.cyrius.com \
--to=tbm@cyrius.com \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).