diff options
| author |   Aaro Koskinen <aaro.koskinen@iki.fi> | 2015-04-04 22:51:07 +0300 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-04-30 16:59:23 +0200 |
| commit | 2638f71307f649532f613a4bcb3b163b7b63017a (patch) | |
| tree | 5d77e841858394c95b3d0d1e1622b3597632f1df /drivers/staging/octeon/ethernet-sgmii.c | |
| parent | staging: octeon-ethernet: add queue information to carrier note (diff) | |
| download | linux-dev-2638f71307f649532f613a4bcb3b163b7b63017a.tar.xz linux-dev-2638f71307f649532f613a4bcb3b163b7b63017a.zip | |
staging: octeon-ethernet: consolidate carrier notifications
Always use cvm_oct_note_carrier() to avoid copy-pasted code.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/octeon/ethernet-sgmii.c')
| -rw-r--r-- | drivers/staging/octeon/ethernet-sgmii.c | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/drivers/staging/octeon/ethernet-sgmii.c b/drivers/staging/octeon/ethernet-sgmii.c index 1158eacc57bb..9a747f94d48c 100644 --- a/drivers/staging/octeon/ethernet-sgmii.c +++ b/drivers/staging/octeon/ethernet-sgmii.c @@ -55,26 +55,12 @@ static void cvm_oct_sgmii_poll(struct net_device *dev) /* Tell Linux */ if (link_info.s.link_up) { - if (!netif_carrier_ok(dev)) netif_carrier_on(dev); - if (priv->queue != -1) - printk_ratelimited - ("%s: %u Mbps %s duplex, port %2d, queue %2d\n", - dev->name, link_info.s.speed, - (link_info.s.full_duplex) ? "Full" : "Half", - priv->port, priv->queue); - else - printk_ratelimited - ("%s: %u Mbps %s duplex, port %2d, POW\n", - dev->name, link_info.s.speed, - (link_info.s.full_duplex) ? "Full" : "Half", - priv->port); - } else { - if (netif_carrier_ok(dev)) - netif_carrier_off(dev); - printk_ratelimited("%s: Link down\n", dev->name); + } else if (netif_carrier_ok(dev)) { + netif_carrier_off(dev); } + cvm_oct_note_carrier(priv, link_info); } int cvm_oct_sgmii_open(struct net_device *dev) |