Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 247447
b: refs/heads/master
c: 1334cb6
h: refs/heads/master
i:
  247445: cf78cd5
  247443: 2cfa8ec
  247439: 5503941
v: v3
  • Loading branch information
David Decotigny authored and David S. Miller committed May 13, 2011
1 parent 4084ca1 commit 09657fd
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 12 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5310cbce900094dce5df4a671b411e15319a75d4
refs/heads/master: 1334cb60826377de8f75adb9902c25302222f4fe
13 changes: 2 additions & 11 deletions trunk/drivers/net/stmmac/stmmac_ethtool.c
Original file line number Diff line number Diff line change
Expand Up @@ -236,17 +236,8 @@ stmmac_set_pauseparam(struct net_device *netdev,
priv->flow_ctrl = new_pause;

if (phy->autoneg) {
if (netif_running(netdev)) {
struct ethtool_cmd cmd = { .cmd = ETHTOOL_SSET };
/* auto-negotiation automatically restarted */
cmd.supported = phy->supported;
cmd.advertising = phy->advertising;
cmd.autoneg = phy->autoneg;
ethtool_cmd_speed_set(&cmd, phy->speed);
cmd.duplex = phy->duplex;
cmd.phy_address = phy->addr;
ret = phy_ethtool_sset(phy, &cmd);
}
if (netif_running(netdev))
ret = phy_start_aneg(phy);
} else
priv->hw->mac->flow_ctrl(priv->ioaddr, phy->duplex,
priv->flow_ctrl, priv->pause);
Expand Down

0 comments on commit 09657fd

Please sign in to comment.