diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-12 15:39:32 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-12 15:39:32 -0700 |
commit | 18552b8f227bddf569dade5c69798a37839ea913 (patch) | |
tree | 2538b43849d9ba6da32e1a309907c9ad488a939c /drivers | |
parent | faa88df860fdfad13afc99fc7201432f9263b3b5 (diff) | |
parent | bd89efc532fe41f867f848144cc8b42054ddf6f9 (diff) | |
download | kernel_samsung_smdk4412-18552b8f227bddf569dade5c69798a37839ea913.zip kernel_samsung_smdk4412-18552b8f227bddf569dade5c69798a37839ea913.tar.gz kernel_samsung_smdk4412-18552b8f227bddf569dade5c69798a37839ea913.tar.bz2 |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[NEIGH]: Fix IP-over-ATM and ARP interaction.
[TG3]: ethtool always report port is TP.
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/tg3.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 2bd9592..e1b33a2 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -7653,21 +7653,23 @@ static int tg3_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) cmd->supported |= (SUPPORTED_1000baseT_Half | SUPPORTED_1000baseT_Full); - if (!(tp->tg3_flags2 & TG3_FLG2_ANY_SERDES)) + if (!(tp->tg3_flags2 & TG3_FLG2_ANY_SERDES)) { cmd->supported |= (SUPPORTED_100baseT_Half | SUPPORTED_100baseT_Full | SUPPORTED_10baseT_Half | SUPPORTED_10baseT_Full | SUPPORTED_MII); - else + cmd->port = PORT_TP; + } else { cmd->supported |= SUPPORTED_FIBRE; + cmd->port = PORT_FIBRE; + } cmd->advertising = tp->link_config.advertising; if (netif_running(dev)) { cmd->speed = tp->link_config.active_speed; cmd->duplex = tp->link_config.active_duplex; } - cmd->port = 0; cmd->phy_address = PHY_ADDR; cmd->transceiver = 0; cmd->autoneg = tp->link_config.autoneg; |