wl1271: Add config structure for connection management parameters

[safe/jmp/linux-2.6] / drivers / net / mlx4 / en_ethtool.c

diff --git a/drivers/net/mlx4/en_ethtool.c b/drivers/net/mlx4/en_ethtool.c
index 91d8116..86467b4 100644 (file)
--- a/drivers/net/mlx4/en_ethtool.c
+++ b/drivers/net/mlx4/en_ethtool.c
@@ -220,7 +220,7 @@ static int mlx4_en_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
        cmd->autoneg = AUTONEG_DISABLE;
        cmd->supported = SUPPORTED_10000baseT_Full;
-       cmd->advertising = SUPPORTED_10000baseT_Full;
+       cmd->advertising = ADVERTISED_1000baseT_Full;
        if (netif_carrier_ok(dev)) {
                cmd->speed = SPEED_10000;
                cmd->duplex = DUPLEX_FULL;
@@ -268,8 +268,7 @@ static int mlx4_en_set_coalesce(struct net_device *dev,
 
        priv->rx_frames = (coal->rx_max_coalesced_frames ==
                           MLX4_EN_AUTO_CONF) ?
-                               MLX4_EN_RX_COAL_TARGET /
-                               priv->dev->mtu + 1 :
+                               MLX4_EN_RX_COAL_TARGET :
                                coal->rx_max_coalesced_frames;
        priv->rx_usecs = (coal->rx_coalesce_usecs ==
                          MLX4_EN_AUTO_CONF) ?