aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/netxen/netxen_nic_ethtool.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/netxen/netxen_nic_ethtool.c')
-rw-r--r--drivers/net/netxen/netxen_nic_ethtool.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/netxen/netxen_nic_ethtool.c b/drivers/net/netxen/netxen_nic_ethtool.c
index 29f90baaa79b..e8d16f6f11e3 100644
--- a/drivers/net/netxen/netxen_nic_ethtool.c
+++ b/drivers/net/netxen/netxen_nic_ethtool.c
@@ -251,6 +251,7 @@ static int
251netxen_nic_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd) 251netxen_nic_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
252{ 252{
253 struct netxen_adapter *adapter = netdev_priv(dev); 253 struct netxen_adapter *adapter = netdev_priv(dev);
254 u32 speed = ethtool_cmd_speed(ecmd);
254 int ret; 255 int ret;
255 256
256 if (adapter->ahw.port_type != NETXEN_NIC_GBE) 257 if (adapter->ahw.port_type != NETXEN_NIC_GBE)
@@ -259,14 +260,14 @@ netxen_nic_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
259 if (!(adapter->capabilities & NX_FW_CAPABILITY_GBE_LINK_CFG)) 260 if (!(adapter->capabilities & NX_FW_CAPABILITY_GBE_LINK_CFG))
260 return -EOPNOTSUPP; 261 return -EOPNOTSUPP;
261 262
262 ret = nx_fw_cmd_set_gbe_port(adapter, ecmd->speed, ecmd->duplex, 263 ret = nx_fw_cmd_set_gbe_port(adapter, speed, ecmd->duplex,
263 ecmd->autoneg); 264 ecmd->autoneg);
264 if (ret == NX_RCODE_NOT_SUPPORTED) 265 if (ret == NX_RCODE_NOT_SUPPORTED)
265 return -EOPNOTSUPP; 266 return -EOPNOTSUPP;
266 else if (ret) 267 else if (ret)
267 return -EIO; 268 return -EIO;
268 269
269 adapter->link_speed = ecmd->speed; 270 adapter->link_speed = speed;
270 adapter->link_duplex = ecmd->duplex; 271 adapter->link_duplex = ecmd->duplex;
271 adapter->link_autoneg = ecmd->autoneg; 272 adapter->link_autoneg = ecmd->autoneg;
272 273