diff options
| author | David S. Miller | 2011-02-04 23:28:58 +0100 |
|---|---|---|
| committer | David S. Miller | 2011-02-04 23:28:58 +0100 |
| commit | bd4a6974cc9090ef3851e5b0a2071e5383565c7c (patch) | |
| tree | e96ef46426d293b730a305b5185ba5412c9172d4 /drivers/net/vxge | |
| parent | be2net: use device model DMA API (diff) | |
| parent | net: can: janz-ican3: world-writable sysfs termination file (diff) | |
| download | kernel-qcow2-linux-bd4a6974cc9090ef3851e5b0a2071e5383565c7c.tar.gz kernel-qcow2-linux-bd4a6974cc9090ef3851e5b0a2071e5383565c7c.tar.xz kernel-qcow2-linux-bd4a6974cc9090ef3851e5b0a2071e5383565c7c.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/vxge')
| -rw-r--r-- | drivers/net/vxge/vxge-config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/vxge/vxge-config.c b/drivers/net/vxge/vxge-config.c index 77097e383cf4..e74e4b42592d 100644 --- a/drivers/net/vxge/vxge-config.c +++ b/drivers/net/vxge/vxge-config.c @@ -3694,7 +3694,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; |