From 9e97342086550ff0eae5255629f14266ed4ae26c Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Tue, 1 Feb 2011 12:56:11 -0800
Subject: [PATCH] --- yaml --- r: 232859 b: refs/heads/master c:
 62175c75fb11ac23fca5cd5fe0baaeb8016a6c78 h: refs/heads/master i:   232857:
 ed7df0933ea7b0a9365eb76c5e00164358f7bc53   232855:
 1805dc21e646c8849e93fd76ad609a6df4247034 v: v3

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

diff --git a/[refs] b/[refs]
index 93a3bd37c151..cf188c619635 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e18247b02d60a1ea4bf98c05e139461ca9aec64
+refs/heads/master: 62175c75fb11ac23fca5cd5fe0baaeb8016a6c78
diff --git a/trunk/drivers/net/vxge/vxge-config.c b/trunk/drivers/net/vxge/vxge-config.c
index 01c05f53e2f9..228d4f7a58af 100644
--- a/trunk/drivers/net/vxge/vxge-config.c
+++ b/trunk/drivers/net/vxge/vxge-config.c
@@ -3690,7 +3690,7 @@ __vxge_hw_vpath_rts_table_get(struct __vxge_hw_vpath_handle *vp,
 	if (status != VXGE_HW_OK)
 		goto exit;
 
-	if ((rts_table != VXGE_HW_RTS_ACCESS_STEER_CTRL_DATA_STRUCT_SEL_DA) ||
+	if ((rts_table != VXGE_HW_RTS_ACCESS_STEER_CTRL_DATA_STRUCT_SEL_DA) &&
 	    (rts_table !=
 	     VXGE_HW_RTS_ACS_STEER_CTRL_DATA_STRUCT_SEL_RTH_MULTI_IT))
 		*data1 = 0;