git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 2:
5e18247
)
Merge branch 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
author
David S. Miller
<davem@davemloft.net>
Tue, 1 Feb 2011 20:56:11 +0000
(12:56 -0800)
committer
David S. Miller
<davem@davemloft.net>
Tue, 1 Feb 2011 20:56:11 +0000
(12:56 -0800)
drivers/net/vxge/vxge-config.c
patch
|
blob
|
history
diff --git
a/drivers/net/vxge/vxge-config.c
b/drivers/net/vxge/vxge-config.c
index
01c05f5
..
228d4f7
100644
(file)
--- a/
drivers/net/vxge/vxge-config.c
+++ b/
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;