mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 08:19:28 +00:00
[PATCH] via-rhine: link state fix
Problems with link state detection have been reported several times in the past months. Denis Vlasenko did all the work tracking it down. Jeff Garzik suggested the proper place for the fix. When using the mii library, the driver needs to check mii->force_media and set dev->state accordingly. Signed-off-by: Roger Luethi <rl@hellgate.ch> Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
parent
b8ab2dc3e1
commit
00b428c2ab
1 changed files with 21 additions and 0 deletions
|
@ -1085,6 +1085,25 @@ static void rhine_check_media(struct net_device *dev, unsigned int init_media)
|
|||
else
|
||||
iowrite8(ioread8(ioaddr + ChipCmd1) & ~Cmd1FDuplex,
|
||||
ioaddr + ChipCmd1);
|
||||
if (debug > 1)
|
||||
printk(KERN_INFO "%s: force_media %d, carrier %d\n", dev->name,
|
||||
rp->mii_if.force_media, netif_carrier_ok(dev));
|
||||
}
|
||||
|
||||
/* Called after status of force_media possibly changed */
|
||||
void rhine_set_carrier(struct mii_if_info *mii)
|
||||
{
|
||||
if (mii->force_media) {
|
||||
/* autoneg is off: Link is always assumed to be up */
|
||||
if (!netif_carrier_ok(mii->dev))
|
||||
netif_carrier_on(mii->dev);
|
||||
}
|
||||
else /* Let MMI library update carrier status */
|
||||
rhine_check_media(mii->dev, 0);
|
||||
if (debug > 1)
|
||||
printk(KERN_INFO "%s: force_media %d, carrier %d\n",
|
||||
mii->dev->name, mii->force_media,
|
||||
netif_carrier_ok(mii->dev));
|
||||
}
|
||||
|
||||
static void rhine_check_media_task(struct net_device *dev)
|
||||
|
@ -1782,6 +1801,7 @@ static int netdev_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
|
|||
spin_lock_irq(&rp->lock);
|
||||
rc = mii_ethtool_sset(&rp->mii_if, cmd);
|
||||
spin_unlock_irq(&rp->lock);
|
||||
rhine_set_carrier(&rp->mii_if);
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
@ -1869,6 +1889,7 @@ static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
|
|||
spin_lock_irq(&rp->lock);
|
||||
rc = generic_mii_ioctl(&rp->mii_if, if_mii(rq), cmd, NULL);
|
||||
spin_unlock_irq(&rp->lock);
|
||||
rhine_set_carrier(&rp->mii_if);
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue