diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-08 23:00:54 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-08 23:00:54 -0800 |
| commit | d0e1e88d6e7dbd8e1661cb6a058ca30f54ee39e4 (patch) | |
| tree | daab7cc0db83226672f76d2fc9277e4355f89e6b /drivers/net/benet/be_ethtool.c | |
| parent | 9e0d57fd6dad37d72a3ca6db00ca8c76f2215454 (diff) | |
| parent | 2606289779cb297320a185db5997729d29b6700b (diff) | |
| download | kernel_samsung_aries-d0e1e88d6e7dbd8e1661cb6a058ca30f54ee39e4.zip kernel_samsung_aries-d0e1e88d6e7dbd8e1661cb6a058ca30f54ee39e4.tar.gz kernel_samsung_aries-d0e1e88d6e7dbd8e1661cb6a058ca30f54ee39e4.tar.bz2 | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/can/usb/ems_usb.c
Diffstat (limited to 'drivers/net/benet/be_ethtool.c')
| -rw-r--r-- | drivers/net/benet/be_ethtool.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/benet/be_ethtool.c b/drivers/net/benet/be_ethtool.c index edebce9..e8f9283 100644 --- a/drivers/net/benet/be_ethtool.c +++ b/drivers/net/benet/be_ethtool.c @@ -362,10 +362,12 @@ be_set_pauseparam(struct net_device *netdev, struct ethtool_pauseparam *ecmd) if (ecmd->autoneg != 0) return -EINVAL; + adapter->tx_fc = ecmd->tx_pause; + adapter->rx_fc = ecmd->rx_pause; - status = be_cmd_set_flow_control(adapter, ecmd->tx_pause, - ecmd->rx_pause); - if (!status) + status = be_cmd_set_flow_control(adapter, + adapter->tx_fc, adapter->rx_fc); + if (status) dev_warn(&adapter->pdev->dev, "Pause param set failed.\n"); return status; |