diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-02-25 15:27:14 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-02-25 15:27:14 -0500 |
| commit | 02fa9f0451ac639a687bfc145eefe58703ff220e (patch) | |
| tree | fe984acc78f22f6eb8fb98efaba8b1ac2f3ad8d9 /drivers/net/vxge/vxge-config.c | |
| parent | cbc9438075ca9dee3f39a2e7310f81c304b40359 (diff) | |
| parent | 51c404b2c514930e98e81e0b9294f19892a4f871 (diff) | |
Merge branch 'patches_for_2.6.38rc' of git://git.pwsan.com/linux-2.6 into devel-fixes
Diffstat (limited to 'drivers/net/vxge/vxge-config.c')
| -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 01c05f53e2f9..228d4f7a58af 100644 --- 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, | |||
| 3690 | if (status != VXGE_HW_OK) | 3690 | if (status != VXGE_HW_OK) |
| 3691 | goto exit; | 3691 | goto exit; |
| 3692 | 3692 | ||
| 3693 | if ((rts_table != VXGE_HW_RTS_ACCESS_STEER_CTRL_DATA_STRUCT_SEL_DA) || | 3693 | if ((rts_table != VXGE_HW_RTS_ACCESS_STEER_CTRL_DATA_STRUCT_SEL_DA) && |
| 3694 | (rts_table != | 3694 | (rts_table != |
| 3695 | VXGE_HW_RTS_ACS_STEER_CTRL_DATA_STRUCT_SEL_RTH_MULTI_IT)) | 3695 | VXGE_HW_RTS_ACS_STEER_CTRL_DATA_STRUCT_SEL_RTH_MULTI_IT)) |
| 3696 | *data1 = 0; | 3696 | *data1 = 0; |