diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2012-08-22 12:29:42 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-08-23 12:11:12 -0400 |
commit | 8200bc72a88cbb63ee13d7f9f16ec4f7249c2ec2 (patch) | |
tree | c46a995658d0bd23be07409512108549d83b5ece /drivers/net/ethernet/realtek/r8169.c | |
parent | 7d7903b2a2e0c87151f8891e67c4c36a86f3fe83 (diff) |
r8169: Preserve other Device Control bits when setting NOSNOOP_EN
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>
Diffstat (limited to 'drivers/net/ethernet/realtek/r8169.c')
-rw-r--r-- | drivers/net/ethernet/realtek/r8169.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 410496817de8..a7cc56007b33 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c | |||
@@ -5385,8 +5385,8 @@ static void rtl_hw_start_8101(struct net_device *dev) | |||
5385 | 5385 | ||
5386 | if (tp->mac_version == RTL_GIGA_MAC_VER_13 || | 5386 | if (tp->mac_version == RTL_GIGA_MAC_VER_13 || |
5387 | tp->mac_version == RTL_GIGA_MAC_VER_16) | 5387 | tp->mac_version == RTL_GIGA_MAC_VER_16) |
5388 | pcie_capability_write_word(pdev, PCI_EXP_DEVCTL, | 5388 | pcie_capability_set_word(pdev, PCI_EXP_DEVCTL, |
5389 | PCI_EXP_DEVCTL_NOSNOOP_EN); | 5389 | PCI_EXP_DEVCTL_NOSNOOP_EN); |
5390 | 5390 | ||
5391 | RTL_W8(Cfg9346, Cfg9346_Unlock); | 5391 | RTL_W8(Cfg9346, Cfg9346_Unlock); |
5392 | 5392 | ||