From 82b2f85005bfecbac0046eb4f38ae66b7cb8a43f Mon Sep 17 00:00:00 2001
From: Karsten Wiese <fzu@wemgehoertderstaat.de>
Date: Thu, 2 Apr 2009 01:06:01 -0700
Subject: [PATCH] --- yaml --- r: 139812 b: refs/heads/master c:
 d78ad8cbfe73ad568de38814a75e9c92ad0a907c h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/net/r8169.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 6ce6ea82badd..865aff63e83f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9ed88549e2ec73922b788e3865282d221233662
+refs/heads/master: d78ad8cbfe73ad568de38814a75e9c92ad0a907c
diff --git a/trunk/drivers/net/r8169.c b/trunk/drivers/net/r8169.c
index 06c535222666..e1a638a05f86 100644
--- a/trunk/drivers/net/r8169.c
+++ b/trunk/drivers/net/r8169.c
@@ -2075,8 +2075,7 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 	if (!tp->pcie_cap && netif_msg_probe(tp))
 		dev_info(&pdev->dev, "no PCI Express capability\n");
 
-	/* Unneeded ? Don't mess with Mrs. Murphy. */
-	rtl8169_irq_mask_and_ack(ioaddr);
+	RTL_W16(IntrMask, 0x0000);
 
 	/* Soft reset the chip. */
 	RTL_W8(ChipCmd, CmdReset);
@@ -2088,6 +2087,8 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 		msleep_interruptible(1);
 	}
 
+	RTL_W16(IntrStatus, 0xffff);
+
 	/* Identify chip attached to board */
 	rtl8169_get_mac_version(tp, ioaddr);