Skip to content

Commit

Permalink
net: use SPEED_UNKNOWN and DUPLEX_UNKNOWN when appropriate
Browse files Browse the repository at this point in the history 
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Jiri Pirko authored and David S. Miller committed Jun 6, 2014
1 parent 1caaab6 commit 537fae0
Show file tree
Hide file tree
Showing 25 changed files with 49 additions and 49 deletions.
4 changes: 2 additions & 2 deletions drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ static int atl1c_get_settings(struct net_device *netdev,
else
ecmd->duplex = DUPLEX_HALF;
} else {
ethtool_cmd_speed_set(ecmd, -1);
ecmd->duplex = -1;
ethtool_cmd_speed_set(ecmd, SPEED_UNKNOWN);
ecmd->duplex = DUPLEX_UNKNOWN;
}

ecmd->autoneg = AUTONEG_ENABLE;
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ static int atl1e_get_settings(struct net_device *netdev,
else
ecmd->duplex = DUPLEX_HALF;
} else {
ethtool_cmd_speed_set(ecmd, -1);
ecmd->duplex = -1;
ethtool_cmd_speed_set(ecmd, SPEED_UNKNOWN);
ecmd->duplex = DUPLEX_UNKNOWN;
}

ecmd->autoneg = AUTONEG_ENABLE;
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/ethernet/atheros/atlx/atl1.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3258,8 +3258,8 @@ static int atl1_get_settings(struct net_device *netdev,
else
ecmd->duplex = DUPLEX_HALF;
} else {
ethtool_cmd_speed_set(ecmd, -1);
ecmd->duplex = -1;
ethtool_cmd_speed_set(ecmd, SPEED_UNKNOWN);
ecmd->duplex = DUPLEX_UNKNOWN;
}
if (hw->media_type == MEDIA_TYPE_AUTO_SENSOR ||
hw->media_type == MEDIA_TYPE_1000M_FULL)
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/ethernet/atheros/atlx/atl2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1769,8 +1769,8 @@ static int atl2_get_settings(struct net_device *netdev,
else
ecmd->duplex = DUPLEX_HALF;
} else {
ethtool_cmd_speed_set(ecmd, -1);
ecmd->duplex = -1;
ethtool_cmd_speed_set(ecmd, SPEED_UNKNOWN);
ecmd->duplex = DUPLEX_UNKNOWN;
}

ecmd->autoneg = AUTONEG_ENABLE;
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/ethernet/broadcom/bnx2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6916,8 +6916,8 @@ bnx2_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
}
}
else {
ethtool_cmd_speed_set(cmd, -1);
cmd->duplex = -1;
ethtool_cmd_speed_set(cmd, SPEED_UNKNOWN);
cmd->duplex = DUPLEX_UNKNOWN;
}
spin_unlock_bh(&bp->phy_lock);

Expand Down
4 changes: 2 additions & 2 deletions drivers/net/ethernet/brocade/bna/bnad_ethtool.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -266,8 +266,8 @@ bnad_get_settings(struct net_device *netdev, struct ethtool_cmd *cmd)
ethtool_cmd_speed_set(cmd, SPEED_10000);
cmd->duplex = DUPLEX_FULL;
} else {
ethtool_cmd_speed_set(cmd, -1);
cmd->duplex = -1;
ethtool_cmd_speed_set(cmd, SPEED_UNKNOWN);
cmd->duplex = DUPLEX_UNKNOWN;
}
cmd->transceiver = XCVR_EXTERNAL;
cmd->maxtxpkt = 0;
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/ethernet/chelsio/cxgb/cxgb2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -580,8 +580,8 @@ static int get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
ethtool_cmd_speed_set(cmd, p->link_config.speed);
cmd->duplex = p->link_config.duplex;
} else {
ethtool_cmd_speed_set(cmd, -1);
cmd->duplex = -1;
ethtool_cmd_speed_set(cmd, SPEED_UNKNOWN);
cmd->duplex = DUPLEX_UNKNOWN;
}

cmd->port = (cmd->supported & SUPPORTED_TP) ? PORT_TP : PORT_FIBRE;
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1809,8 +1809,8 @@ static int get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
ethtool_cmd_speed_set(cmd, p->link_config.speed);
cmd->duplex = p->link_config.duplex;
} else {
ethtool_cmd_speed_set(cmd, -1);
cmd->duplex = -1;
ethtool_cmd_speed_set(cmd, SPEED_UNKNOWN);
cmd->duplex = DUPLEX_UNKNOWN;
}

cmd->port = (cmd->supported & SUPPORTED_TP) ? PORT_TP : PORT_FIBRE;
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/ethernet/cisco/enic/enic_ethtool.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ static int enic_get_settings(struct net_device *netdev,
ethtool_cmd_speed_set(ecmd, vnic_dev_port_speed(enic->vdev));
ecmd->duplex = DUPLEX_FULL;
} else {
ethtool_cmd_speed_set(ecmd, -1);
ecmd->duplex = -1;
ethtool_cmd_speed_set(ecmd, SPEED_UNKNOWN);
ecmd->duplex = DUPLEX_UNKNOWN;
}

ecmd->autoneg = AUTONEG_DISABLE;
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/ethernet/dec/tulip/uli526x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -962,8 +962,8 @@ ULi_ethtool_gset(struct uli526x_board_info *db, struct ethtool_cmd *ecmd)
}
if(db->link_failed)
{
ethtool_cmd_speed_set(ecmd, -1);
ecmd->duplex = -1;
ethtool_cmd_speed_set(ecmd, SPEED_UNKNOWN);
ecmd->duplex = DUPLEX_UNKNOWN;
}

if (db->media_mode & ULI526X_AUTO)
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/ethernet/dlink/dl2k.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1185,8 +1185,8 @@ static int rio_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
ethtool_cmd_speed_set(cmd, np->speed);
cmd->duplex = np->full_duplex ? DUPLEX_FULL : DUPLEX_HALF;
} else {
ethtool_cmd_speed_set(cmd, -1);
cmd->duplex = -1;
ethtool_cmd_speed_set(cmd, SPEED_UNKNOWN);
cmd->duplex = DUPLEX_UNKNOWN;
}
if ( np->an_enable)
cmd->autoneg = AUTONEG_ENABLE;
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/ethernet/ibm/ehea/ehea_ethtool.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ static int ehea_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
cmd->duplex = port->full_duplex == 1 ?
DUPLEX_FULL : DUPLEX_HALF;
} else {
speed = ~0;
cmd->duplex = -1;
speed = SPEED_UNKNOWN;
cmd->duplex = DUPLEX_UNKNOWN;
}
ethtool_cmd_speed_set(cmd, speed);

Expand Down
4 changes: 2 additions & 2 deletions drivers/net/ethernet/intel/e1000/e1000_ethtool.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,8 @@ static int e1000_get_settings(struct net_device *netdev,
else
ecmd->duplex = DUPLEX_HALF;
} else {
ethtool_cmd_speed_set(ecmd, -1);
ecmd->duplex = -1;
ethtool_cmd_speed_set(ecmd, SPEED_UNKNOWN);
ecmd->duplex = DUPLEX_UNKNOWN;
}

ecmd->autoneg = ((hw->media_type == e1000_media_type_fiber) ||
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/ethernet/intel/e1000e/ethtool.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,8 @@ static int e1000_get_settings(struct net_device *netdev,
ecmd->transceiver = XCVR_EXTERNAL;
}

speed = -1;
ecmd->duplex = -1;
speed = SPEED_UNKNOWN;
ecmd->duplex = DUPLEX_UNKNOWN;

if (netif_running(netdev)) {
if (netif_carrier_ok(netdev)) {
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/ethernet/intel/igb/igb_ethtool.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,8 @@ static int igb_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
else
ecmd->duplex = DUPLEX_HALF;
} else {
ecmd->speed = -1;
ecmd->duplex = -1;
ecmd->speed = SPEED_UNKNOWN;
ecmd->duplex = DUPLEX_UNKNOWN;
}
if ((hw->phy.media_type == e1000_media_type_fiber) ||
hw->mac.autoneg)
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/ethernet/intel/igbvf/ethtool.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ static int igbvf_get_settings(struct net_device *netdev,
else
ecmd->duplex = DUPLEX_HALF;
} else {
ethtool_cmd_speed_set(ecmd, -1);
ecmd->duplex = -1;
ethtool_cmd_speed_set(ecmd, SPEED_UNKNOWN);
ecmd->duplex = DUPLEX_UNKNOWN;
}

ecmd->autoneg = AUTONEG_DISABLE;
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ ixgb_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
ethtool_cmd_speed_set(ecmd, SPEED_10000);
ecmd->duplex = DUPLEX_FULL;
} else {
ethtool_cmd_speed_set(ecmd, -1);
ecmd->duplex = -1;
ethtool_cmd_speed_set(ecmd, SPEED_UNKNOWN);
ecmd->duplex = DUPLEX_UNKNOWN;
}

ecmd->autoneg = AUTONEG_DISABLE;
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,8 +296,8 @@ static int ixgbe_get_settings(struct net_device *netdev,
}
ecmd->duplex = DUPLEX_FULL;
} else {
ethtool_cmd_speed_set(ecmd, -1);
ecmd->duplex = -1;
ethtool_cmd_speed_set(ecmd, SPEED_UNKNOWN);
ecmd->duplex = DUPLEX_UNKNOWN;
}

return 0;
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/ethernet/intel/ixgbevf/ethtool.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,8 @@ static int ixgbevf_get_settings(struct net_device *netdev,
ethtool_cmd_speed_set(ecmd, speed);
ecmd->duplex = DUPLEX_FULL;
} else {
ethtool_cmd_speed_set(ecmd, -1);
ecmd->duplex = -1;
ethtool_cmd_speed_set(ecmd, SPEED_UNKNOWN);
ecmd->duplex = DUPLEX_UNKNOWN;
}

return 0;
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -378,8 +378,8 @@ static int mlx4_en_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
ethtool_cmd_speed_set(cmd, priv->port_state.link_speed);
cmd->duplex = DUPLEX_FULL;
} else {
ethtool_cmd_speed_set(cmd, -1);
cmd->duplex = -1;
ethtool_cmd_speed_set(cmd, SPEED_UNKNOWN);
cmd->duplex = DUPLEX_UNKNOWN;
}

if (trans_type > 0 && trans_type <= 0xC) {
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/ethernet/neterion/s2io.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5360,8 +5360,8 @@ static int s2io_ethtool_gset(struct net_device *dev, struct ethtool_cmd *info)
ethtool_cmd_speed_set(info, SPEED_10000);
info->duplex = DUPLEX_FULL;
} else {
ethtool_cmd_speed_set(info, -1);
info->duplex = -1;
ethtool_cmd_speed_set(info, SPEED_UNKNOWN);
info->duplex = DUPLEX_UNKNOWN;
}

info->autoneg = AUTONEG_DISABLE;
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/ethernet/neterion/vxge/vxge-ethtool.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ static int vxge_ethtool_gset(struct net_device *dev, struct ethtool_cmd *info)
ethtool_cmd_speed_set(info, SPEED_10000);
info->duplex = DUPLEX_FULL;
} else {
ethtool_cmd_speed_set(info, -1);
info->duplex = -1;
ethtool_cmd_speed_set(info, SPEED_UNKNOWN);
info->duplex = DUPLEX_UNKNOWN;
}

info->autoneg = AUTONEG_DISABLE;
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/ethernet/nvidia/forcedeth.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4285,8 +4285,8 @@ static int nv_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
if (np->duplex)
ecmd->duplex = DUPLEX_FULL;
} else {
speed = -1;
ecmd->duplex = -1;
speed = SPEED_UNKNOWN;
ecmd->duplex = DUPLEX_UNKNOWN;
}
ethtool_cmd_speed_set(ecmd, speed);
ecmd->autoneg = np->autoneg;
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ static int pch_gbe_get_settings(struct net_device *netdev,
ecmd->advertising &= ~(ADVERTISED_TP | ADVERTISED_1000baseT_Half);

if (!netif_carrier_ok(adapter->netdev))
ethtool_cmd_speed_set(ecmd, -1);
ethtool_cmd_speed_set(ecmd, SPEED_UNKNOWN);
return ret;
}

Expand Down
4 changes: 2 additions & 2 deletions drivers/net/vmxnet3/vmxnet3_ethtool.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -431,8 +431,8 @@ vmxnet3_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
ethtool_cmd_speed_set(ecmd, adapter->link_speed);
ecmd->duplex = DUPLEX_FULL;
} else {
ethtool_cmd_speed_set(ecmd, -1);
ecmd->duplex = -1;
ethtool_cmd_speed_set(ecmd, SPEED_UNKNOWN);
ecmd->duplex = DUPLEX_UNKNOWN;
}
return 0;
}
Expand Down

0 comments on commit 537fae0

Please sign in to comment.