diff options
Diffstat (limited to 'drivers/net/bcm63xx_enet.c')
-rw-r--r-- | drivers/net/bcm63xx_enet.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/bcm63xx_enet.c b/drivers/net/bcm63xx_enet.c index c48104b0886..f1573d492e9 100644 --- a/drivers/net/bcm63xx_enet.c +++ b/drivers/net/bcm63xx_enet.c | |||
@@ -839,8 +839,8 @@ static int bcm_enet_open(struct net_device *dev) | |||
839 | if (ret) | 839 | if (ret) |
840 | goto out_phy_disconnect; | 840 | goto out_phy_disconnect; |
841 | 841 | ||
842 | ret = request_irq(priv->irq_rx, bcm_enet_isr_dma, | 842 | ret = request_irq(priv->irq_rx, bcm_enet_isr_dma, IRQF_DISABLED, |
843 | IRQF_SAMPLE_RANDOM | IRQF_DISABLED, dev->name, dev); | 843 | dev->name, dev); |
844 | if (ret) | 844 | if (ret) |
845 | goto out_freeirq; | 845 | goto out_freeirq; |
846 | 846 | ||
@@ -1346,7 +1346,8 @@ static int bcm_enet_get_settings(struct net_device *dev, | |||
1346 | return phy_ethtool_gset(priv->phydev, cmd); | 1346 | return phy_ethtool_gset(priv->phydev, cmd); |
1347 | } else { | 1347 | } else { |
1348 | cmd->autoneg = 0; | 1348 | cmd->autoneg = 0; |
1349 | cmd->speed = (priv->force_speed_100) ? SPEED_100 : SPEED_10; | 1349 | ethtool_cmd_speed_set(cmd, ((priv->force_speed_100) |
1350 | ? SPEED_100 : SPEED_10)); | ||
1350 | cmd->duplex = (priv->force_duplex_full) ? | 1351 | cmd->duplex = (priv->force_duplex_full) ? |
1351 | DUPLEX_FULL : DUPLEX_HALF; | 1352 | DUPLEX_FULL : DUPLEX_HALF; |
1352 | cmd->supported = ADVERTISED_10baseT_Half | | 1353 | cmd->supported = ADVERTISED_10baseT_Half | |