diff options
author | Jon Mason <jon.mason@exar.com> | 2010-11-10 23:26:01 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-11-11 12:30:23 -0500 |
commit | ca3e3b8fae982400dacbbf19f3112cc84e51d46a (patch) | |
tree | df9281d265161c04fa632ed8a4ccaac9bd1392a4 /drivers/net/vxge/vxge-config.c | |
parent | e7935c9669c27c5d530bff634c0c15f7a602d697 (diff) |
vxge: correct multi-function detection
The values used to determined if the adapter is running in single or
multi-function mode were previously modified to the values necessary
when making the VXGE_HW_FW_API_GET_FUNC_MODE firmware call. However,
the firmware call was not modified. This had the driver printing out on
probe that the adapter was in multi-function mode when in single
function mode and vice versa.
Signed-off-by: Jon Mason <jon.mason@exar.com>
Signed-off-by: Ram Vepa <ram.vepa@exar.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/vxge/vxge-config.c')
-rw-r--r-- | drivers/net/vxge/vxge-config.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/vxge/vxge-config.c b/drivers/net/vxge/vxge-config.c index 5903b2e9a6e9..14dc8c8f47ef 100644 --- a/drivers/net/vxge/vxge-config.c +++ b/drivers/net/vxge/vxge-config.c | |||
@@ -1091,16 +1091,16 @@ __vxge_hw_vpath_pci_func_mode_get(struct __vxge_hw_virtualpath *vpath, | |||
1091 | u64 data0, data1 = 0, steer_ctrl = 0; | 1091 | u64 data0, data1 = 0, steer_ctrl = 0; |
1092 | enum vxge_hw_status status; | 1092 | enum vxge_hw_status status; |
1093 | 1093 | ||
1094 | data0 = VXGE_HW_RTS_ACCESS_STEER_DATA0_MEMO_ITEM_PCI_MODE; | 1094 | data0 = 0; |
1095 | 1095 | ||
1096 | status = vxge_hw_vpath_fw_api(vpath, | 1096 | status = vxge_hw_vpath_fw_api(vpath, |
1097 | VXGE_HW_RTS_ACCESS_STEER_CTRL_ACTION_READ_MEMO_ENTRY, | 1097 | VXGE_HW_FW_API_GET_FUNC_MODE, |
1098 | VXGE_HW_RTS_ACCESS_STEER_CTRL_DATA_STRUCT_SEL_FW_MEMO, | 1098 | VXGE_HW_RTS_ACCESS_STEER_CTRL_DATA_STRUCT_SEL_FW_MEMO, |
1099 | 0, &data0, &data1, &steer_ctrl); | 1099 | 0, &data0, &data1, &steer_ctrl); |
1100 | if (status != VXGE_HW_OK) | 1100 | if (status != VXGE_HW_OK) |
1101 | return status; | 1101 | return status; |
1102 | 1102 | ||
1103 | hw_info->function_mode = data0; | 1103 | hw_info->function_mode = VXGE_HW_GET_FUNC_MODE_VAL(data0); |
1104 | return status; | 1104 | return status; |
1105 | } | 1105 | } |
1106 | 1106 | ||