Commit 8b243a61 authored by David S. Miller's avatar David S. Miller

Merge branch 'r8152-next'

Hayes Wang says:

====================
r8152: support nway_reset

Fix the CHECK from checkpatch.pl and support nway_reset.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents dca145ff 8884f507
...@@ -486,7 +486,7 @@ struct tally_counter { ...@@ -486,7 +486,7 @@ struct tally_counter {
__le64 rx_broadcast; __le64 rx_broadcast;
__le32 rx_multicast; __le32 rx_multicast;
__le16 tx_aborted; __le16 tx_aborted;
__le16 tx_underun; __le16 tx_underrun;
}; };
struct rx_desc { struct rx_desc {
...@@ -3420,7 +3420,7 @@ static void rtl8152_get_ethtool_stats(struct net_device *dev, ...@@ -3420,7 +3420,7 @@ static void rtl8152_get_ethtool_stats(struct net_device *dev,
data[9] = le64_to_cpu(tally.rx_broadcast); data[9] = le64_to_cpu(tally.rx_broadcast);
data[10] = le32_to_cpu(tally.rx_multicast); data[10] = le32_to_cpu(tally.rx_multicast);
data[11] = le16_to_cpu(tally.tx_aborted); 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) static void rtl8152_get_strings(struct net_device *dev, u32 stringset, u8 *data)
...@@ -3558,11 +3558,33 @@ rtl_ethtool_set_eee(struct net_device *net, struct ethtool_eee *edata) ...@@ -3558,11 +3558,33 @@ rtl_ethtool_set_eee(struct net_device *net, struct ethtool_eee *edata)
return ret; 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 = { static struct ethtool_ops ops = {
.get_drvinfo = rtl8152_get_drvinfo, .get_drvinfo = rtl8152_get_drvinfo,
.get_settings = rtl8152_get_settings, .get_settings = rtl8152_get_settings,
.set_settings = rtl8152_set_settings, .set_settings = rtl8152_set_settings,
.get_link = ethtool_op_get_link, .get_link = ethtool_op_get_link,
.nway_reset = rtl8152_nway_reset,
.get_msglevel = rtl8152_get_msglevel, .get_msglevel = rtl8152_get_msglevel,
.set_msglevel = rtl8152_set_msglevel, .set_msglevel = rtl8152_set_msglevel,
.get_wol = rtl8152_get_wol, .get_wol = rtl8152_get_wol,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment