---

yaml --- r: 189855 b: refs/heads/master c: 2488f56 h: refs/heads/master i: 189853: 06fb41c 189851: e38236e 189847: e3a963a 189839: 7640c8e 189823: adc8a8d v: v3
git-mirror · Apr 8, 2010 · 7d6bcca · 7d6bcca
1 parent 17f8572
commit 7d6bcca
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;