From: Jeff Garzik <jgarzik@pobox.com>
To: torvalds@osdl.org
Cc: akpm@osdl.org, linux-kernel@vger.kernel.org
Subject: Re: [BK PATCHES] net driver fixes
Date: Fri, 05 Dec 2003 13:54:33 -0500 [thread overview]
Message-ID: <3FD0D469.3070504@pobox.com> (raw)
In-Reply-To: <20031205183037.GA8536@gtf.org>
[-- Attachment #1: Type: text/plain, Size: 547 bytes --]
Jeff Garzik wrote:
> Linus, please do a
>
> bk pull bk://gkernel.bkbits.net/net-drivers-2.5
>
> This will update the following files:
>
> drivers/net/pci-skeleton.c | 7 ---
> drivers/net/pcnet32.c | 2
> drivers/net/r8169.c | 4 -
> drivers/net/sis190.c | 4 -
> drivers/net/typhoon.c | 97 ++++++++++++++++++++++++++++++++++++---------
> 5 files changed, 78 insertions(+), 36 deletions(-)
So following that email... you just wanna truncate this patch -- snip
the typhoon portion and apply the rest?
[-- Attachment #2: patch --]
[-- Type: text/plain, Size: 2671 bytes --]
This will update the following files:
drivers/net/pci-skeleton.c | 7 ---
drivers/net/pcnet32.c | 2
drivers/net/r8169.c | 4 -
drivers/net/sis190.c | 4 -
through these ChangeSets:
<jgarzik@redhat.com> (03/12/05 1.1499)
[netdrvr pcnet32] fix oops on unload
Driver was calling pci_unregister_driver for each _device_, and then
again at the end of the module unload routine. Remove the call that's
inside the loop, pci_unregister_driver should only be called once.
Caught by Don Fry (and many others)
<viro@parcelfarce.linux.theplanet.co.uk> (03/12/03 1.1496.1.9)
[netdrvr] remove manual driver poisoning of net_device
Such poisoning can cause oopses either because the refcount is not
zero when the poisoning occurs, or due to kernel debugging options
being enabled.
diff -Nru a/drivers/net/pci-skeleton.c b/drivers/net/pci-skeleton.c
--- a/drivers/net/pci-skeleton.c Fri Dec 5 13:22:32 2003
+++ b/drivers/net/pci-skeleton.c Fri Dec 5 13:22:32 2003
@@ -864,13 +864,6 @@
pci_release_regions (pdev);
-#ifndef NETDRV_NDEBUG
- /* poison memory before freeing */
- memset (dev, 0xBC,
- sizeof (struct net_device) +
- sizeof (struct netdrv_private));
-#endif /* NETDRV_NDEBUG */
-
free_netdev (dev);
pci_set_drvdata (pdev, NULL);
diff -Nru a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c
--- a/drivers/net/pcnet32.c Fri Dec 5 13:22:32 2003
+++ b/drivers/net/pcnet32.c Fri Dec 5 13:22:32 2003
@@ -1766,8 +1766,6 @@
next_dev = lp->next;
unregister_netdev(pcnet32_dev);
release_region(pcnet32_dev->base_addr, PCNET32_TOTAL_SIZE);
- if (lp->pci_dev)
- pci_unregister_driver(&pcnet32_driver);
pci_free_consistent(lp->pci_dev, sizeof(*lp), lp, lp->dma_addr);
free_netdev(pcnet32_dev);
pcnet32_dev = next_dev;
diff -Nru a/drivers/net/r8169.c b/drivers/net/r8169.c
--- a/drivers/net/r8169.c Fri Dec 5 13:22:32 2003
+++ b/drivers/net/r8169.c Fri Dec 5 13:22:32 2003
@@ -642,10 +642,6 @@
iounmap(tp->mmio_addr);
pci_release_regions(pdev);
- // poison memory before freeing
- memset(dev, 0xBC,
- sizeof (struct net_device) + sizeof (struct rtl8169_private));
-
pci_disable_device(pdev);
free_netdev(dev);
pci_set_drvdata(pdev, NULL);
diff -Nru a/drivers/net/sis190.c b/drivers/net/sis190.c
--- a/drivers/net/sis190.c Fri Dec 5 13:22:32 2003
+++ b/drivers/net/sis190.c Fri Dec 5 13:22:32 2003
@@ -703,10 +703,6 @@
iounmap(tp->mmio_addr);
pci_release_regions(pdev);
- // poison memory before freeing
- memset(dev, 0xBC,
- sizeof (struct net_device) + sizeof (struct sis190_private));
-
free_netdev(dev);
pci_set_drvdata(pdev, NULL);
}
next prev parent reply other threads:[~2003-12-05 18:56 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-12-05 18:30 [BK PATCHES] net driver fixes Jeff Garzik
2003-12-05 18:54 ` Jeff Garzik [this message]
-- strict thread matches above, loose matches on Subject: below --
2003-11-08 17:27 Jeff Garzik
2003-02-13 7:57 Jeff Garzik
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=3FD0D469.3070504@pobox.com \
--to=jgarzik@pobox.com \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@osdl.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).