From: Colin Leroy <colin@colino.net>
To: linux-kernel@vger.kernel.org
Cc: akpm@osdl.org, Jeff Garzik <jgarzik@pobox.com>
Subject: [PATCH] Revert mistakenly applied patch to sungem
Date: Thu, 30 Sep 2004 10:01:56 +0200 [thread overview]
Message-ID: <20040930100156.6012a290@pirandello> (raw)
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;
next reply other threads:[~2004-09-30 8:02 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-09-30 8:01 Colin Leroy [this message]
2004-09-30 23:08 ` Jeff Garzik
2004-10-01 0:01 ` Andrew Morton
2004-10-01 0:28 ` David S. Miller
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=20040930100156.6012a290@pirandello \
--to=colin@colino.net \
--cc=akpm@osdl.org \
--cc=jgarzik@pobox.com \
--cc=linux-kernel@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
Powered by JetHome