diff options
| author | Francois Romieu <romieu@fr.zoreil.com> | 2011-03-11 20:30:24 +0100 |
|---|---|---|
| committer | Francois romieu <romieu@fr.zoreil.com> | 2011-05-09 21:03:01 +0200 |
| commit | 826e6cbdadfa51495c7189641df2514cc48e23da (patch) | |
| tree | 41f572c46c0c07e001f7fb07538f1751271bdb7b /drivers/net/r8169.c | |
| parent | 6f43adc88f49cb8164fbd665e968de4de380dc35 (diff) | |
| download | linux-stable-826e6cbdadfa51495c7189641df2514cc48e23da.tar.gz linux-stable-826e6cbdadfa51495c7189641df2514cc48e23da.tar.bz2 linux-stable-826e6cbdadfa51495c7189641df2514cc48e23da.zip | |
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>
Diffstat (limited to 'drivers/net/r8169.c')
| -rw-r--r-- | drivers/net/r8169.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index 976bb31b2092..182c79474434 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -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) |