r8169: Preserve other Device Control bits when setting NOSNOOP_EN
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 22 Aug 2012 16:29:42 +0000 (10:29 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Thu, 23 Aug 2012 16:11:12 +0000 (10:11 -0600)
Previously, when we turned on the "Enable No Snoop Bit," we cleared all
the other Device Control bits, including error reporting enables,
Max_Payload_Size, Max_Read_Request_Size, etc.  This patch preserves
all the other bits.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
drivers/net/ethernet/realtek/r8169.c

index 410496817de8234b7aff720e909bdef0e5a4adb5..a7cc56007b330457c53b49ef4c51145d4990221d 100644 (file)
@@ -5385,8 +5385,8 @@ static void rtl_hw_start_8101(struct net_device *dev)
 
        if (tp->mac_version == RTL_GIGA_MAC_VER_13 ||
            tp->mac_version == RTL_GIGA_MAC_VER_16)
-               pcie_capability_write_word(pdev, PCI_EXP_DEVCTL,
-                                          PCI_EXP_DEVCTL_NOSNOOP_EN);
+               pcie_capability_set_word(pdev, PCI_EXP_DEVCTL,
+                                        PCI_EXP_DEVCTL_NOSNOOP_EN);
 
        RTL_W8(Cfg9346, Cfg9346_Unlock);