66f8f30f47
Update patches with their upstream versions. Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 37098
44 lines
1.4 KiB
Diff
44 lines
1.4 KiB
Diff
From a15c33450df64f183c8ab5de8ef113091081679d Mon Sep 17 00:00:00 2001
|
|
From: Maxime Bizon <mbizon@freebox.fr>
|
|
Date: Tue, 4 Jun 2013 20:53:33 +0000
|
|
Subject: [PATCH 1/3] bcm63xx_enet: implement reset autoneg ethtool callback
|
|
|
|
Implement the rset_nway ethtool callback which uses libphy generic
|
|
autonegotiation restart function.
|
|
|
|
Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
|
|
---
|
|
drivers/net/ethernet/broadcom/bcm63xx_enet.c | 15 +++++++++++++++
|
|
1 file changed, 15 insertions(+)
|
|
|
|
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
|
|
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
|
|
@@ -1330,6 +1330,20 @@ static void bcm_enet_get_ethtool_stats(s
|
|
mutex_unlock(&priv->mib_update_lock);
|
|
}
|
|
|
|
+static int bcm_enet_nway_reset(struct net_device *dev)
|
|
+{
|
|
+ struct bcm_enet_priv *priv;
|
|
+
|
|
+ priv = netdev_priv(dev);
|
|
+ if (priv->has_phy) {
|
|
+ if (!priv->phydev)
|
|
+ return -ENODEV;
|
|
+ return genphy_restart_aneg(priv->phydev);
|
|
+ }
|
|
+
|
|
+ return -EOPNOTSUPP;
|
|
+}
|
|
+
|
|
static int bcm_enet_get_settings(struct net_device *dev,
|
|
struct ethtool_cmd *cmd)
|
|
{
|
|
@@ -1472,6 +1486,7 @@ static const struct ethtool_ops bcm_enet
|
|
.get_strings = bcm_enet_get_strings,
|
|
.get_sset_count = bcm_enet_get_sset_count,
|
|
.get_ethtool_stats = bcm_enet_get_ethtool_stats,
|
|
+ .nway_reset = bcm_enet_nway_reset,
|
|
.get_settings = bcm_enet_get_settings,
|
|
.set_settings = bcm_enet_set_settings,
|
|
.get_drvinfo = bcm_enet_get_drvinfo,
|