diff options
| author |   David S. Miller <davem@davemloft.net> | 2014-10-29 15:09:16 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-10-29 15:09:16 -0400 |
| commit | 8b243a61940d2ca3c3a370e551b88d47a09ede0c (patch) | |
| tree | d6899f66d352b03aa2bc70deb6fbb8c09afd7b1e | |
| parent | tcp: allow for bigger reordering level (diff) | |
| parent | r8152: support nway_reset of ethtool (diff) | |
| download | linux-dev-8b243a61940d2ca3c3a370e551b88d47a09ede0c.tar.xz linux-dev-8b243a61940d2ca3c3a370e551b88d47a09ede0c.zip | |
Merge branch 'r8152-next'
Hayes Wang says:
====================
r8152: support nway_reset
Fix the CHECK from checkpatch.pl and support nway_reset.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/usb/r8152.c | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index e3d84c322e4e..e1810bc386b7 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -486,7 +486,7 @@ struct tally_counter { __le64 rx_broadcast; __le32 rx_multicast; __le16 tx_aborted; - __le16 tx_underun; + __le16 tx_underrun; }; struct rx_desc { @@ -3420,7 +3420,7 @@ static void rtl8152_get_ethtool_stats(struct net_device *dev, data[9] = le64_to_cpu(tally.rx_broadcast); data[10] = le32_to_cpu(tally.rx_multicast); data[11] = le16_to_cpu(tally.tx_aborted); - data[12] = le16_to_cpu(tally.tx_underun); + data[12] = le16_to_cpu(tally.tx_underrun); } static void rtl8152_get_strings(struct net_device *dev, u32 stringset, u8 *data) @@ -3558,11 +3558,33 @@ out: return ret; } +static int rtl8152_nway_reset(struct net_device *dev) +{ + struct r8152 *tp = netdev_priv(dev); + int ret; + + ret = usb_autopm_get_interface(tp->intf); + if (ret < 0) + goto out; + + mutex_lock(&tp->control); + + ret = mii_nway_restart(&tp->mii); + + mutex_unlock(&tp->control); + + usb_autopm_put_interface(tp->intf); + +out: + return ret; +} + static struct ethtool_ops ops = { .get_drvinfo = rtl8152_get_drvinfo, .get_settings = rtl8152_get_settings, .set_settings = rtl8152_set_settings, .get_link = ethtool_op_get_link, + .nway_reset = rtl8152_nway_reset, .get_msglevel = rtl8152_get_msglevel, .set_msglevel = rtl8152_set_msglevel, .get_wol = rtl8152_get_wol, |