diff for duplicates of <47BDC3E7.8040807@intel.com> diff --git a/a/2.hdr b/N1/2.hdr index c38599f..4b86001 100644 --- a/a/2.hdr +++ b/N1/2.hdr @@ -1,5 +1,4 @@ -Content-Type: text/x-patch; - name="e100_irq.patch" +Content-Type: text/plain; charset="us-ascii" +MIME-Version: 1.0 Content-Transfer-Encoding: 7bit -Content-Disposition: inline; - filename="e100_irq.patch" +Content-Disposition: inline diff --git a/a/2.txt b/N1/2.txt index ab65513..7656627 100644 --- a/a/2.txt +++ b/N1/2.txt @@ -1,74 +1,4 @@ -e100: Do suspend/shutdown like e1000 - -This fixes a "trying to free already free IRQ" message and simplifies -the shutdown/suspend code by re-using already existing code when going -to suspend. The code is now symmetric with e100_resume. - -Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com> - -diff --git a/drivers/net/e100.c b/drivers/net/e100.c -index 36ba6dc..cdf3090 100644 ---- a/drivers/net/e100.c -+++ b/drivers/net/e100.c -@@ -2782,16 +2782,13 @@ static void __devexit e100_remove(struct pci_dev *pdev) - } - } - --#ifdef CONFIG_PM - static int e100_suspend(struct pci_dev *pdev, pm_message_t state) - { - struct net_device *netdev = pci_get_drvdata(pdev); - struct nic *nic = netdev_priv(netdev); - - if (netif_running(netdev)) -- napi_disable(&nic->napi); -- del_timer_sync(&nic->watchdog); -- netif_carrier_off(nic->netdev); -+ e100_down(nic); - netif_device_detach(netdev); - - pci_save_state(pdev); -@@ -2804,14 +2801,13 @@ static int e100_suspend(struct pci_dev *pdev, pm_message_t state) - pci_enable_wake(pdev, PCI_D3cold, 0); - } - -- free_irq(pdev->irq, netdev); -- - pci_disable_device(pdev); - pci_set_power_state(pdev, PCI_D3hot); - - return 0; - } - -+#ifdef CONFIG_PM - static int e100_resume(struct pci_dev *pdev) - { - struct net_device *netdev = pci_get_drvdata(pdev); -@@ -2832,26 +2828,7 @@ static int e100_resume(struct pci_dev *pdev) - - static void e100_shutdown(struct pci_dev *pdev) - { -- struct net_device *netdev = pci_get_drvdata(pdev); -- struct nic *nic = netdev_priv(netdev); -- -- if (netif_running(netdev)) -- napi_disable(&nic->napi); -- del_timer_sync(&nic->watchdog); -- netif_carrier_off(nic->netdev); -- -- if ((nic->flags & wol_magic) | e100_asf(nic)) { -- pci_enable_wake(pdev, PCI_D3hot, 1); -- pci_enable_wake(pdev, PCI_D3cold, 1); -- } else { -- pci_enable_wake(pdev, PCI_D3hot, 0); -- pci_enable_wake(pdev, PCI_D3cold, 0); -- } -- -- free_irq(pdev->irq, netdev); -- -- pci_disable_device(pdev); -- pci_set_power_state(pdev, PCI_D3hot); -+ e100_suspend(pdev, PMSG_SUSPEND); - } - - /* ------------------ PCI Error Recovery infrastructure -------------- */ +------------------------------------------------------------------------- +This SF.net email is sponsored by: Microsoft +Defy all challenges. Microsoft(R) Visual Studio 2008. +http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ diff --git a/N1/3.hdr b/N1/3.hdr new file mode 100644 index 0000000..4b86001 --- /dev/null +++ b/N1/3.hdr @@ -0,0 +1,4 @@ +Content-Type: text/plain; charset="us-ascii" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Content-Disposition: inline diff --git a/N1/3.txt b/N1/3.txt new file mode 100644 index 0000000..75951ff --- /dev/null +++ b/N1/3.txt @@ -0,0 +1,4 @@ +_______________________________________________ +E1000-devel mailing list +E1000-devel@lists.sourceforge.net +https://lists.sourceforge.net/lists/listinfo/e1000-devel diff --git a/a/content_digest b/N1/content_digest index ba19721..ba28513 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -7,10 +7,10 @@ "Date\0Thu, 21 Feb 2008 10:33:11 -0800\0" "To\0Kok" " Auke <auke-jan.h.kok@intel.com>\0" - "Cc\0Andrew Morton <akpm@linux-foundation.org>" - Andrey Borzenkov <arvidjaar@mail.ru> - e1000-devel@lists.sourceforge.net + "Cc\0e1000-devel@lists.sourceforge.net" netdev@vger.kernel.org + Andrew Morton <akpm@linux-foundation.org> + Andrey Borzenkov <arvidjaar@mail.ru> " linux-kernel@vger.kernel.org\0" "\01:1\0" "b\0" @@ -126,81 +126,16 @@ "\n" Auke "\01:2\0" - "fn\0e100_irq.patch\0" "b\0" - "e100: Do suspend/shutdown like e1000\n" - "\n" - "This fixes a \"trying to free already free IRQ\" message and simplifies\n" - "the shutdown/suspend code by re-using already existing code when going\n" - "to suspend. The code is now symmetric with e100_resume.\n" - "\n" - "Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>\n" - "\n" - "diff --git a/drivers/net/e100.c b/drivers/net/e100.c\n" - "index 36ba6dc..cdf3090 100644\n" - "--- a/drivers/net/e100.c\n" - "+++ b/drivers/net/e100.c\n" - "@@ -2782,16 +2782,13 @@ static void __devexit e100_remove(struct pci_dev *pdev)\n" - " \t}\n" - " }\n" - " \n" - "-#ifdef CONFIG_PM\n" - " static int e100_suspend(struct pci_dev *pdev, pm_message_t state)\n" - " {\n" - " \tstruct net_device *netdev = pci_get_drvdata(pdev);\n" - " \tstruct nic *nic = netdev_priv(netdev);\n" - " \n" - " \tif (netif_running(netdev))\n" - "-\t\tnapi_disable(&nic->napi);\n" - "-\tdel_timer_sync(&nic->watchdog);\n" - "-\tnetif_carrier_off(nic->netdev);\n" - "+\t\te100_down(nic);\n" - " \tnetif_device_detach(netdev);\n" - " \n" - " \tpci_save_state(pdev);\n" - "@@ -2804,14 +2801,13 @@ static int e100_suspend(struct pci_dev *pdev, pm_message_t state)\n" - " \t\tpci_enable_wake(pdev, PCI_D3cold, 0);\n" - " \t}\n" - " \n" - "-\tfree_irq(pdev->irq, netdev);\n" - "-\n" - " \tpci_disable_device(pdev);\n" - " \tpci_set_power_state(pdev, PCI_D3hot);\n" - " \n" - " \treturn 0;\n" - " }\n" - " \n" - "+#ifdef CONFIG_PM\n" - " static int e100_resume(struct pci_dev *pdev)\n" - " {\n" - " \tstruct net_device *netdev = pci_get_drvdata(pdev);\n" - "@@ -2832,26 +2828,7 @@ static int e100_resume(struct pci_dev *pdev)\n" - " \n" - " static void e100_shutdown(struct pci_dev *pdev)\n" - " {\n" - "-\tstruct net_device *netdev = pci_get_drvdata(pdev);\n" - "-\tstruct nic *nic = netdev_priv(netdev);\n" - "-\n" - "-\tif (netif_running(netdev))\n" - "-\t\tnapi_disable(&nic->napi);\n" - "-\tdel_timer_sync(&nic->watchdog);\n" - "-\tnetif_carrier_off(nic->netdev);\n" - "-\n" - "-\tif ((nic->flags & wol_magic) | e100_asf(nic)) {\n" - "-\t\tpci_enable_wake(pdev, PCI_D3hot, 1);\n" - "-\t\tpci_enable_wake(pdev, PCI_D3cold, 1);\n" - "-\t} else {\n" - "-\t\tpci_enable_wake(pdev, PCI_D3hot, 0);\n" - "-\t\tpci_enable_wake(pdev, PCI_D3cold, 0);\n" - "-\t}\n" - "-\n" - "-\tfree_irq(pdev->irq, netdev);\n" - "-\n" - "-\tpci_disable_device(pdev);\n" - "-\tpci_set_power_state(pdev, PCI_D3hot);\n" - "+\te100_suspend(pdev, PMSG_SUSPEND);\n" - " }\n" - " \n" - /* ------------------ PCI Error Recovery infrastructure -------------- */ + "-------------------------------------------------------------------------\n" + "This SF.net email is sponsored by: Microsoft\n" + "Defy all challenges. Microsoft(R) Visual Studio 2008.\n" + http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ + "\01:3\0" + "b\0" + "_______________________________________________\n" + "E1000-devel mailing list\n" + "E1000-devel@lists.sourceforge.net\n" + https://lists.sourceforge.net/lists/listinfo/e1000-devel -8faf80707c51d2d240ae2da826be1e5abfa5b8435d18831c9a12f79681c4910d +e85b7a0c674677ab1f7da8c212367d00c386f97a105d212a07c98c9ae9687cce
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.