diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-08-22 10:29:42 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-08-23 10:11:12 -0600 |
| commit | 8200bc72a88cbb63ee13d7f9f16ec4f7249c2ec2 (patch) | |
| tree | c46a995658d0bd23be07409512108549d83b5ece | |
| parent | 7d7903b2a2e0c87151f8891e67c4c36a86f3fe83 (diff) | |
| download | op-kernel-dev-8200bc72a88cbb63ee13d7f9f16ec4f7249c2ec2.zip op-kernel-dev-8200bc72a88cbb63ee13d7f9f16ec4f7249c2ec2.tar.gz | |
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>
| -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 4104968..a7cc560 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) 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); |
