From 7d6bccab8201755a0cda2c5dc043898c8a79a977 Mon Sep 17 00:00:00 2001
From: Brice Goglin <brice@myri.com>
Date: Wed, 7 Apr 2010 22:23:45 -0700
Subject: [PATCH] --- yaml --- r: 189855 b: refs/heads/master c:
 2488f56d3699b84ee51d2940d1347345b8f9b0e1 h: refs/heads/master i:   189853:
 06fb41ca4a5d46df7fe118bd612efadf9299f41f   189851:
 e38236e57975439927cb1ae4c9b7fdec47a3ab1f   189847:
 e3a963afe3a947285165b97a083219564c1f2e7c   189839:
 7640c8ee4148c6c3a69dfbd894827fd3acca9382   189823:
 adc8a8d263b87fb4ab6a87efcbcde0a4d9e53b5c v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/net/myri10ge/myri10ge.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1a25043cee27..b0e644a9f432 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69298698c2453c2f8cd1d7d2a4cae39eeec3b66e
+refs/heads/master: 2488f56d3699b84ee51d2940d1347345b8f9b0e1
diff --git a/trunk/drivers/net/myri10ge/myri10ge.c b/trunk/drivers/net/myri10ge/myri10ge.c
index e84dd3ee9c5a..3cb760706c01 100644
--- a/trunk/drivers/net/myri10ge/myri10ge.c
+++ b/trunk/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;