* Re: Diff between Linus' and linux-mips git: declance [not found] ` <20060220000141.GX10266@deprecation.cyrius.com> @ 2006-02-20 0:17 ` Martin Michlmayr 2006-02-20 14:22 ` Martin Michlmayr 0 siblings, 1 reply; 3+ messages in thread From: Martin Michlmayr @ 2006-02-20 0:17 UTC (permalink / raw) To: netdev, linux-mips Remove delta between Linus' and linux-mips git trees in declance There are two changes between the Linus' and linux-mips git trees regarding the declaner driver. The first change is certainly correct (as it is consistent with the rest of the file) and should be applied to mainline; the other change seems correct too. Signed-off-by: Martin Michlmayr <tbm@cyrius.com> --- linux-2.6.16-rc4/drivers/net/declance.c 2006-02-19 20:09:07.000000000 +0000 +++ mips-2.6.16-rc4/drivers/net/declance.c 2006-02-19 20:15:22.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; -- Martin Michlmayr http://www.cyrius.com/ ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Diff between Linus' and linux-mips git: declance 2006-02-20 0:17 ` Diff between Linus' and linux-mips git: declance Martin Michlmayr @ 2006-02-20 14:22 ` Martin Michlmayr 2006-02-20 17:02 ` Maciej W. Rozycki 0 siblings, 1 reply; 3+ messages in thread From: Martin Michlmayr @ 2006-02-20 14:22 UTC (permalink / raw) To: netdev, linux-mips Updated patch, please apply. [PATCH] Remove delta between Linus' and linux-mips git trees in declance There are three changes between the Linus' and linux-mips git trees regarding the declaner driver. The first change is certainly correct (as it is consistent with the rest of the file) and should be applied to mainline; the other change seems correct too. And the third is cosmetic. Signed-off-by: Martin Michlmayr <tbm@cyrius.com> --- --- a/drivers/net/declance.c 2006-02-03 03:07:02.000000000 +0000 +++ b/drivers/net/declance.c 2006-02-19 23:50:11.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/ ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Diff between Linus' and linux-mips git: declance 2006-02-20 14:22 ` Martin Michlmayr @ 2006-02-20 17:02 ` Maciej W. Rozycki 0 siblings, 0 replies; 3+ messages in thread From: Maciej W. Rozycki @ 2006-02-20 17:02 UTC (permalink / raw) To: Martin Michlmayr; +Cc: netdev, linux-mips On Mon, 20 Feb 2006, Martin Michlmayr wrote: > Updated patch, please apply. > > > [PATCH] Remove delta between Linus' and linux-mips git trees in declance > > There are three changes between the Linus' and linux-mips git trees > regarding the declaner driver. The first change is certainly correct > (as it is consistent with the rest of the file) and should be applied > to mainline; the other change seems correct too. And the third is > cosmetic. > > Signed-off-by: Martin Michlmayr <tbm@cyrius.com> Acked-by: Maciej W. Rozycki <macro@linux-mips.org> Maciej ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2006-02-20 17:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20060219234318.GA16311@deprecation.cyrius.com>
[not found] ` <20060220000141.GX10266@deprecation.cyrius.com>
2006-02-20 0:17 ` Diff between Linus' and linux-mips git: declance Martin Michlmayr
2006-02-20 14:22 ` Martin Michlmayr
2006-02-20 17:02 ` Maciej W. Rozycki
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).