commit 62175c75fb11ac23fca5cd5fe0baaeb8016a6c78
author David S. Miller <davem@davemloft.net> Tue Feb 01 12:56:11 2011 -0800
committer David S. Miller <davem@davemloft.net> Tue Feb 01 12:56:11 2011 -0800
tree 65ecfa19a9dc510e2e3792c3b950605b1a2c3cb7
parent 48bc9a2ccec98de007117495123bba78a4bbdd9c
parent 5e18247b02d60a1ea4bf98c05e139461ca9aec64

Merge branch 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

drivers/net/vxge/vxge-config.c

diff --git a/drivers/net/vxge/vxge-config.c b/drivers/net/vxge/vxge-config.c
index 01c05f5..228d4f7 100644
--- a/drivers/net/vxge/vxge-config.c
+++ b/drivers/net/vxge/vxge-config.c
@@ -3690,7 +3690,7 @@
 	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;