Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8200bc72 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

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: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 7d7903b2

drivers/net/ethernet/realtek/r8169.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -5385,7 +5385,7 @@ static void rtl_hw_start_8101(struct net_device *dev) 




	if (tp->mac_version == RTL_GIGA_MAC_VER_13 ||

	if (tp->mac_version == RTL_GIGA_MAC_VER_13 ||

	    tp->mac_version == RTL_GIGA_MAC_VER_16)

	    tp->mac_version == RTL_GIGA_MAC_VER_16)

		pcie_capability_write_word(pdev, PCI_EXP_DEVCTL,

		pcie_capability_set_word(pdev, PCI_EXP_DEVCTL,

					 PCI_EXP_DEVCTL_NOSNOOP_EN);

					 PCI_EXP_DEVCTL_NOSNOOP_EN);





	RTL_W8(Cfg9346, Cfg9346_Unlock);

	RTL_W8(Cfg9346, Cfg9346_Unlock);