From 69f0cfafe6ec52c73e11c4bed1491b68c1e85b11 Mon Sep 17 00:00:00 2001 From: Francois Romieu Date: Thu, 4 Oct 2007 00:42:50 +0200 Subject: [PATCH] --- yaml --- r: 65295 b: refs/heads/master c: c946b3047205d7e107be16885bbb42ab9f10350a h: refs/heads/master i: 65293: 81aa8eb27a1c1054b2af23bc01a639a58687cd4a 65291: 86a76ad7709929754a82d94cbcd2b089f74e0018 65287: 25032cb326abda393d1d7dad62fe20e9fc064adc 65279: beba9cd3c8eb8622b43c767e29b74796849a40b4 v: v3 --- [refs] | 2 +- trunk/drivers/net/r8169.c | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 679463f73294..4cbb5a9418c5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: af299901efac5ede381e01448a31a560a4eca853 +refs/heads/master: c946b3047205d7e107be16885bbb42ab9f10350a diff --git a/trunk/drivers/net/r8169.c b/trunk/drivers/net/r8169.c index c921ec32c232..c76dd29c8e9a 100644 --- a/trunk/drivers/net/r8169.c +++ b/trunk/drivers/net/r8169.c @@ -1918,7 +1918,11 @@ static void rtl_hw_start_8169(struct net_device *dev) rtl_set_rx_max_size(ioaddr); - rtl_set_rx_tx_config_registers(tp); + if ((tp->mac_version == RTL_GIGA_MAC_VER_01) || + (tp->mac_version == RTL_GIGA_MAC_VER_02) || + (tp->mac_version == RTL_GIGA_MAC_VER_03) || + (tp->mac_version == RTL_GIGA_MAC_VER_04)) + rtl_set_rx_tx_config_registers(tp); tp->cp_cmd |= rtl_rw_cpluscmd(ioaddr) | PCIMulRW; @@ -1941,6 +1945,14 @@ static void rtl_hw_start_8169(struct net_device *dev) rtl_set_rx_tx_desc_registers(tp, ioaddr); + if ((tp->mac_version != RTL_GIGA_MAC_VER_01) && + (tp->mac_version != RTL_GIGA_MAC_VER_02) && + (tp->mac_version != RTL_GIGA_MAC_VER_03) && + (tp->mac_version != RTL_GIGA_MAC_VER_04)) { + RTL_W8(ChipCmd, CmdTxEnb | CmdRxEnb); + rtl_set_rx_tx_config_registers(tp); + } + RTL_W8(Cfg9346, Cfg9346_Lock); /* Initially a 10 us delay. Turned it into a PCI commit. - FR */ @@ -1955,8 +1967,6 @@ static void rtl_hw_start_8169(struct net_device *dev) /* Enable all known interrupts by setting the interrupt mask. */ RTL_W16(IntrMask, tp->intr_event); - - RTL_W8(ChipCmd, CmdTxEnb | CmdRxEnb); } static void rtl_hw_start_8168(struct net_device *dev)