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

Commit d9995973 authored by Jeff Garzik's avatar Jeff Garzik Committed by Jeff Garzik
Browse files

Merge branch 'r8169-davem' of... 

Merge branch 'r8169-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev-2.6 into upstream-fixes
parents b32d1310 77332894

drivers/net/r8169.c

+5 −9
Original line number Diff line number Diff line
@@ -1418,8 +1418,10 @@ static void rtl8169_init_phy(struct net_device *dev, struct rtl8169_private *tp) 


	rtl_hw_phy_config(dev);



	if (tp->mac_version <= RTL_GIGA_MAC_VER_06) {

		dprintk("Set MAC Reg C+CR Offset 0x82h = 0x01h\n");

		RTL_W8(0x82, 0x01);

	}



	pci_write_config_byte(tp->pci_dev, PCI_LATENCY_TIMER, 0x40);
@@ -3032,13 +3034,7 @@ static void rtl_set_rx_mode(struct net_device *dev) 
	tmp = rtl8169_rx_config | rx_mode |

	      (RTL_R32(RxConfig) & rtl_chip_info[tp->chipset].RxConfigMask);



	if ((tp->mac_version == RTL_GIGA_MAC_VER_11) ||

	    (tp->mac_version == RTL_GIGA_MAC_VER_12) ||

	    (tp->mac_version == RTL_GIGA_MAC_VER_13) ||

	    (tp->mac_version == RTL_GIGA_MAC_VER_14) ||

	    (tp->mac_version == RTL_GIGA_MAC_VER_15) ||

	    (tp->mac_version == RTL_GIGA_MAC_VER_16) ||

	    (tp->mac_version == RTL_GIGA_MAC_VER_17)) {

	if (tp->mac_version > RTL_GIGA_MAC_VER_06) {

		u32 data = mc_filter[0];



		mc_filter[0] = swab32(mc_filter[1]);