[PATCH] remove manual driver poisoning of net_device

From: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>

   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 --git a/drivers/net/pci-skeleton.c b/drivers/net/pci-skeleton.c
index 75f2da5c3928eb9f66f4696dee135bfdeb5acb1d..b671d8c9a84f1652d52d1f62ac9115d181c3493b 100644 (file)
--- a/drivers/net/pci-skeleton.c
+++ b/drivers/net/pci-skeleton.c
@@ -864,13 +864,6 @@ static void __devexit netdrv_remove_one (struct pci_dev *pdev)
 
        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 --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 10f43aaf222dc86a0154681d5463a332cc386be8..fdc2ef5567dea1a767c26a8c292d5ace60de2b44 100644 (file)
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -642,10 +642,6 @@ rtl8169_remove_one(struct pci_dev *pdev)
        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 --git a/drivers/net/sis190.c b/drivers/net/sis190.c
index da4ea1b59eaa89c56f629f3c1e7ac2607e5fd17e..369f8e7dfe8f5d0aa7d210e702dfac5a644d620c 100644 (file)
--- a/drivers/net/sis190.c
+++ b/drivers/net/sis190.c
@@ -703,10 +703,6 @@ SiS190_remove_one(struct pci_dev *pdev)
        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);
 }