UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

r8169: rtl8169_set_speed_xmii cleanup. 

Shorten chipset version test.

No functional change.

Careful readers will notice that the 'supports_gmii' flag is deduced
from the device PCI id. Though less specific than the chipset related
RTL_GIGA_MAC_VER_XY, it is good enough to detect a GMII deprieved 810x.
Some features push for a device specific configuration (improved jumbo
frame support for instance). 'supports_gmii' will follow this path
if / when the device PCI id test stops working.

Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Cc: Realtek linux nic maintainers <nic_swsd@realtek.com>
This commit is contained in:
Francois Romieu 2011-03-11 20:30:24 +01:00 committed by Francois romieu
parent 6f43adc88f
commit 826e6cbdad
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/r8169.c
View File

@ -1258,16 +1258,7 @@ static int rtl8169_set_speed_xmii(struct net_device *dev,
giga_ctrl &= ~(ADVERTISE_1000FULL | ADVERTISE_1000HALF);
/* The 8100e/8101e/8102e do Fast Ethernet only. */
if (tp->mac_version != RTL_GIGA_MAC_VER_07 &&
tp->mac_version != RTL_GIGA_MAC_VER_08 &&
tp->mac_version != RTL_GIGA_MAC_VER_09 &&
tp->mac_version != RTL_GIGA_MAC_VER_10 &&
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_29 &&
tp->mac_version != RTL_GIGA_MAC_VER_30) {
if (tp->mii.supports_gmii) {
if (adv & ADVERTISED_1000baseT_Half)
giga_ctrl |= ADVERTISE_1000HALF;
if (adv & ADVERTISED_1000baseT_Full)