diff options
| author | Francois Romieu <romieu@fr.zoreil.com> | 2007-11-06 22:56:10 +0100 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-11-10 04:25:09 -0500 |
| commit | 66ec5d4fb1ce6f0bd9df4bc4b758f0916d9f37ab (patch) | |
| tree | 0a17f413b5c56906720db6814624ad3d34764b7c | |
| parent | 11d2e28241e89227d88da53187224c84316acc86 (diff) | |
| download | kernel_samsung_smdk4412-66ec5d4fb1ce6f0bd9df4bc4b758f0916d9f37ab.zip kernel_samsung_smdk4412-66ec5d4fb1ce6f0bd9df4bc4b758f0916d9f37ab.tar.gz kernel_samsung_smdk4412-66ec5d4fb1ce6f0bd9df4bc4b758f0916d9f37ab.tar.bz2 | |
r8169: do not enable the TBI for the 8168 and the 81x0
The 8168c and the 8100e choke on it. I have not seen an indication
nor received a report that the TBI is being actively used on the
remaining 8168b and 8110. Let's disable it for now until someone
complains.
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Cc: Matthias Winkler <m.winkler@unicon-ka.de>
Cc: Maarten Vanraes <maarten.vanraes@gmail.com>
Cc: Edward Hsu <edward_hsu@realtek.com.tw>
| -rw-r--r-- | drivers/net/r8169.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index 702334e..9dbab3f 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -1741,7 +1741,8 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) tp->features |= rtl_try_msi(pdev, ioaddr, cfg); RTL_W8(Cfg9346, Cfg9346_Lock); - if (RTL_R8(PHYstatus) & TBI_Enable) { + if ((tp->mac_version <= RTL_GIGA_MAC_VER_06) && + (RTL_R8(PHYstatus) & TBI_Enable)) { tp->set_speed = rtl8169_set_speed_tbi; tp->get_settings = rtl8169_gset_tbi; tp->phy_reset_enable = rtl8169_tbi_reset_enable; |