netdev - [PATCH net-next] e1000e: restore call to pci_clear

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20130612174747.7449.40767.email-sent-by-dnelson@teal>
Date:	Wed, 12 Jun 2013 13:47:47 -0400
From:	Dean Nelson <dnelson@...hat.com>
To:	David Miller <davem@...emloft.net>
Cc:	Konstantin Khlebnikov <khlebnikov@...nvz.org>,
	netdev@...r.kernel.org, Jeff Kirsher <jeffrey.t.kersher@...el.com>,
	Bruce Allan <bruce.w.allan@...el.com>
Subject: [PATCH net-next] e1000e: restore call to pci_clear_master()

In attempting to resolve a minor merge conflict, commit e5f2ef7ab4690d2e8faa
accidently dropped a call to pci_clear_master() that was intended to remain
in place.

Commit 4e0855dff094b0d56d6b replaced a call to pci_disable_device() by one to
pci_clear_master(). And then commit 66148babe728f3e00e13 deleted a number of
lines starting two lines following that call.

This patch restores the call to pci_clear_master() in __e1000_shutdown().

Signed-off-by: Dean Nelson <dnelson@...hat.com>
---
Both stable 3.8.y and 3.9.y appear to have the call to pci_clear_master() in
__e1000_shutdown() as desired.  I'm not sure how they avoided the conflict.

 drivers/net/ethernet/intel/e1000e/netdev.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 77f81cb..5475cf4 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -5995,6 +5995,8 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool runtime)
 	 */
 	e1000e_release_hw_control(adapter);
 
+	pci_clear_master(pdev);
+
 	/* The pci-e switch on some quad port adapters will report a
 	 * correctable error when the MAC transitions from D0 to D3.  To
 	 * prevent this we need to mask off the correctable errors on the
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html