* [PATCH] Revert mistakenly applied patch to sungem
@ 2004-09-30 8:01 Colin Leroy
2004-09-30 23:08 ` Jeff Garzik
0 siblings, 1 reply; 4+ messages in thread
From: Colin Leroy @ 2004-09-30 8:01 UTC (permalink / raw)
To: linux-kernel; +Cc: akpm, Jeff Garzik
Hi Andrew, everyone,
There's a mistake in 2.6.9-rc3, you applied a patch I sent yesterday,
for something that was already implemented (netpoll support in sungem).
As Eric Lemoine and I didn't add the stuff at the same place, there has
been no conflict.
See http://marc.theaimsgroup.com/?l=linux-kernel&m=109647405508937&w=2
http://linux.bkbits.net:8080/linux-2.5/cset@4149f001_LtxxbZOVP8q363TiTcSVg
http://linux.bkbits.net:8080/linux-2.5/cset@415b4276tcoFzDd1YSqq2ZJ_OkYlfQ
Following is the reverse patch to reverse my stuff :)
Sorry about that.
Signed-off-by: Colin Leroy <colin@colino.net>
--- a/drivers/net/sungem.c 2004-09-29 12:15:56.000000000 +0200
+++ b/drivers/net/sungem.c 2004-09-29 12:22:41.000000000 +0200
@@ -2687,23 +2687,6 @@
}
#endif /* not Sparc and not PPC */
-#ifdef CONFIG_NET_POLL_CONTROLLER
-/*
- * Polling 'interrupt' - used by things like netconsole to send skbs
- * without having to re-enable interrupts. It's not called while
- * the interrupt routine is executing.
- */
-static void gem_netpoll(struct net_device *netdev)
-{
- struct gem *gp = netdev->priv;
- if (!gp->pdev)
- return;
- disable_irq(gp->pdev->irq);
- gem_interrupt(gp->pdev->irq, netdev, NULL);
- enable_irq(gp->pdev->irq);
-}
-#endif
-
static int __devinit gem_get_device_address(struct gem *gp)
{
#if defined(__sparc__) || defined(CONFIG_PPC_PMAC)
@@ -2899,9 +2882,6 @@
dev->set_multicast_list = gem_set_multicast;
dev->do_ioctl = gem_ioctl;
dev->poll = gem_poll;
-#ifdef CONFIG_NET_POLL_CONTROLLER
- dev->poll_controller = gem_netpoll;
-#endif
dev->weight = 64;
dev->ethtool_ops = &gem_ethtool_ops;
dev->tx_timeout = gem_tx_timeout;
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] Revert mistakenly applied patch to sungem
2004-09-30 8:01 [PATCH] Revert mistakenly applied patch to sungem Colin Leroy
@ 2004-09-30 23:08 ` Jeff Garzik
2004-10-01 0:01 ` Andrew Morton
0 siblings, 1 reply; 4+ messages in thread
From: Jeff Garzik @ 2004-09-30 23:08 UTC (permalink / raw)
To: akpm; +Cc: Colin Leroy, linux-kernel
Colin Leroy wrote:
> Hi Andrew, everyone,
>
> There's a mistake in 2.6.9-rc3, you applied a patch I sent yesterday,
> for something that was already implemented (netpoll support in sungem).
>
> As Eric Lemoine and I didn't add the stuff at the same place, there has
> been no conflict.
>
> See http://marc.theaimsgroup.com/?l=linux-kernel&m=109647405508937&w=2
> http://linux.bkbits.net:8080/linux-2.5/cset@4149f001_LtxxbZOVP8q363TiTcSVg
> http://linux.bkbits.net:8080/linux-2.5/cset@415b4276tcoFzDd1YSqq2ZJ_OkYlfQ
>
> Following is the reverse patch to reverse my stuff :)
> Sorry about that.
>
> Signed-off-by: Colin Leroy <colin@colino.net>
Andrew are you picking up this one?
Jeff
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Revert mistakenly applied patch to sungem
2004-09-30 23:08 ` Jeff Garzik
@ 2004-10-01 0:01 ` Andrew Morton
2004-10-01 0:28 ` David S. Miller
0 siblings, 1 reply; 4+ messages in thread
From: Andrew Morton @ 2004-10-01 0:01 UTC (permalink / raw)
To: Jeff Garzik; +Cc: colin, linux-kernel
Jeff Garzik <jgarzik@pobox.com> wrote:
>
> Colin Leroy wrote:
> > Hi Andrew, everyone,
> >
> > There's a mistake in 2.6.9-rc3, you applied a patch I sent yesterday,
> > for something that was already implemented (netpoll support in sungem).
> >
> > As Eric Lemoine and I didn't add the stuff at the same place, there has
> > been no conflict.
> >
> > See http://marc.theaimsgroup.com/?l=linux-kernel&m=109647405508937&w=2
> > http://linux.bkbits.net:8080/linux-2.5/cset@4149f001_LtxxbZOVP8q363TiTcSVg
> > http://linux.bkbits.net:8080/linux-2.5/cset@415b4276tcoFzDd1YSqq2ZJ_OkYlfQ
> >
> > Following is the reverse patch to reverse my stuff :)
> > Sorry about that.
> >
> > Signed-off-by: Colin Leroy <colin@colino.net>
>
> Andrew are you picking up this one?
umm, sure. That's another 40 patches in my future yet ;)
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Revert mistakenly applied patch to sungem
2004-10-01 0:01 ` Andrew Morton
@ 2004-10-01 0:28 ` David S. Miller
0 siblings, 0 replies; 4+ messages in thread
From: David S. Miller @ 2004-10-01 0:28 UTC (permalink / raw)
To: Andrew Morton; +Cc: jgarzik, colin, linux-kernel
On Thu, 30 Sep 2004 17:01:59 -0700
Andrew Morton <akpm@osdl.org> wrote:
> > > Following is the reverse patch to reverse my stuff :)
> > > Sorry about that.
> > >
> > > Signed-off-by: Colin Leroy <colin@colino.net>
> >
> > Andrew are you picking up this one?
>
> umm, sure. That's another 40 patches in my future yet ;)
Andrew/Jeff, don't worry about this one I'm taking care of it in
my tree already.
I added the mistake I should fix it up :)
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2004-10-01 0:30 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-09-30 8:01 [PATCH] Revert mistakenly applied patch to sungem Colin Leroy
2004-09-30 23:08 ` Jeff Garzik
2004-10-01 0:01 ` Andrew Morton
2004-10-01 0:28 ` David S. Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.