Skip to contentSkip to conversation

Revert mistakenly applied patch to sungem

PATCH In review Colin Leroy 4 participants 4 messages Sep 30, 2004 – Oct 1, 2004 Network drivers

lore
Share & tools
lore

Colin Leroy

author
#0 lore raw

PATCH 1/1 Revert mistakenly applied patch to sungem

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 <[email protected]>
drivers/net/sungem.c +0 -20
@@ -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;
#1 lore raw
Quoted 8 lines · Colin Leroy

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.

Quoted 8 lines

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 <[email protected]>

Andrew are you picking up this one?

Jeff

#2 lore raw
Quoted 14 lines · Jeff Garzik
Quoted 12 lines · Colin Leroy

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

Quoted 6 lines
Quoted 4 lines

Following is the reverse patch to reverse my stuff :) Sorry about that.

Signed-off-by Colin Leroy <[email protected]>

Andrew are you picking up this one?

umm, sure. That's another 40 patches in my future yet ;)

maintainer
#3 lore raw
Quoted 8 lines · On Thu, 30 Sep 2004 17:01:59 -0700 Andrew Morton <[email protected]> wrote:
Quoted 6 lines
Quoted 4 lines

Following is the reverse patch to reverse my stuff :) Sorry about that.

Signed-off-by Colin Leroy <[email protected]>

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 :)