summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorBrice Goglin <brice@myri.com>2010-04-08 07:23:45 +0200
committerDavid S. Miller <davem@davemloft.net>2010-04-08 07:23:45 +0200
commit2488f56d3699b84ee51d2940d1347345b8f9b0e1 (patch)
treebd9d3b520da7971ee6082ab029ea4fa4ef20f2dd /drivers
parentnet: corrected documentation for hardware time stamping (diff)
downloadlinux-2488f56d3699b84ee51d2940d1347345b8f9b0e1.tar.xz
linux-2488f56d3699b84ee51d2940d1347345b8f9b0e1.zip
myri10ge: fix rx_pause in myri10ge_set_pauseparam
Fix rx_pause management in myri10ge_set_pauseparam(). Signed-off-by: Brice Goglin <brice@myri.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/myri10ge/myri10ge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index e84dd3ee9c5a..3cb760706c01 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -1689,7 +1689,7 @@ myri10ge_set_pauseparam(struct net_device *netdev,
if (pause->tx_pause != mgp->pause)
return myri10ge_change_pause(mgp, pause->tx_pause);
if (pause->rx_pause != mgp->pause)
- return myri10ge_change_pause(mgp, pause->tx_pause);
+ return myri10ge_change_pause(mgp, pause->rx_pause);
if (pause->autoneg != 0)
return -EINVAL;
return 0;