diff options
| author | David S. Miller <davem@davemloft.net> | 2009-04-16 20:35:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-16 20:35:26 -0400 |
| commit | a54bfa40fd16aeb90bc556189221576f746f8567 (patch) | |
| tree | 176bb7a99ffab5f42f0dd4e9671f335be3f3efa0 /drivers/net/benet | |
| parent | fe957c40ec5e2763b9977c565beab3bde3aaf85b (diff) | |
| parent | 134ffb4cad92a6aa534e55a9be145bca780a32c1 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/benet')
| -rw-r--r-- | drivers/net/benet/be_ethtool.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/benet/be_ethtool.c b/drivers/net/benet/be_ethtool.c index 04f4b73fa8d..9592f22e4c8 100644 --- a/drivers/net/benet/be_ethtool.c +++ b/drivers/net/benet/be_ethtool.c | |||
| @@ -319,7 +319,7 @@ be_get_pauseparam(struct net_device *netdev, struct ethtool_pauseparam *ecmd) | |||
| 319 | 319 | ||
| 320 | be_cmd_get_flow_control(&adapter->ctrl, &ecmd->tx_pause, | 320 | be_cmd_get_flow_control(&adapter->ctrl, &ecmd->tx_pause, |
| 321 | &ecmd->rx_pause); | 321 | &ecmd->rx_pause); |
| 322 | ecmd->autoneg = AUTONEG_ENABLE; | 322 | ecmd->autoneg = 0; |
| 323 | } | 323 | } |
| 324 | 324 | ||
| 325 | static int | 325 | static int |
| @@ -328,7 +328,7 @@ be_set_pauseparam(struct net_device *netdev, struct ethtool_pauseparam *ecmd) | |||
| 328 | struct be_adapter *adapter = netdev_priv(netdev); | 328 | struct be_adapter *adapter = netdev_priv(netdev); |
| 329 | int status; | 329 | int status; |
| 330 | 330 | ||
| 331 | if (ecmd->autoneg != AUTONEG_ENABLE) | 331 | if (ecmd->autoneg != 0) |
| 332 | return -EINVAL; | 332 | return -EINVAL; |
| 333 | 333 | ||
| 334 | status = be_cmd_set_flow_control(&adapter->ctrl, ecmd->tx_pause, | 334 | status = be_cmd_set_flow_control(&adapter->ctrl, ecmd->tx_pause, |