diff options
| author | Ben Hutchings <ben.hutchings@codethink.co.uk> | 2015-01-16 17:55:35 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-01-19 15:43:42 -0500 |
| commit | 5bdc73800dad3ef5d06977a4b90304bd34353933 (patch) | |
| tree | 18cb054bd34e363d5f60b520baca32a95c27cdb8 /drivers/net/ethernet/via | |
| parent | 8f1115b4f2193e421ed1e56ced079153e270f16f (diff) | |
| download | linux-5bdc73800dad3ef5d06977a4b90304bd34353933.tar.bz2 | |
mii: Handle link state changes for forced modes in mii_check_media()
mii_check_media() does not update the link (carrier) state or log link
changes when the link mode is forced. Drivers using the mii library
must do this themselves, but most of them do not.
Instead of changing them all, provide a sensible default behaviour
similar to mii_check_link() when the mode is forced.
via-rhine depends on it being a no-op in this case, so make its call
to mii_check_media() conditional.
Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/via')
| -rw-r--r-- | drivers/net/ethernet/via/via-rhine.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c index 0ac76102b33d..17e276651601 100644 --- a/drivers/net/ethernet/via/via-rhine.c +++ b/drivers/net/ethernet/via/via-rhine.c @@ -1326,7 +1326,8 @@ static void rhine_check_media(struct net_device *dev, unsigned int init_media) struct rhine_private *rp = netdev_priv(dev); void __iomem *ioaddr = rp->base; - mii_check_media(&rp->mii_if, netif_msg_link(rp), init_media); + if (!rp->mii_if.force_media) + mii_check_media(&rp->mii_if, netif_msg_link(rp), init_media); if (rp->mii_if.full_duplex) iowrite8(ioread8(ioaddr + ChipCmd1) | Cmd1FDuplex, |