qlcnic: Fix QLogic application/driver interface for virtual NIC configuration
o Application expect vNIC number as the array index but driver interface return configuration in array index form. o Pack the vNIC information array in the buffer such that application can access it using vNIC number as the array index. Signed-off-by: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com> Signed-off-by: Shahed Shaikh <shahed.shaikh@qlogic.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
a78b6da89f
commit
4f03022777
|
@ -354,7 +354,7 @@ int qlcnic_is_valid_nic_func(struct qlcnic_adapter *adapter, u8 pci_func)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
for (i = 0; i < adapter->ahw->max_vnic_func; i++) {
|
for (i = 0; i < adapter->ahw->total_nic_func; i++) {
|
||||||
if (adapter->npars[i].pci_func == pci_func)
|
if (adapter->npars[i].pci_func == pci_func)
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
|
@ -720,6 +720,7 @@ static ssize_t qlcnic_sysfs_read_npar_config(struct file *file,
|
||||||
struct qlcnic_adapter *adapter = dev_get_drvdata(dev);
|
struct qlcnic_adapter *adapter = dev_get_drvdata(dev);
|
||||||
struct qlcnic_npar_func_cfg *np_cfg;
|
struct qlcnic_npar_func_cfg *np_cfg;
|
||||||
struct qlcnic_info nic_info;
|
struct qlcnic_info nic_info;
|
||||||
|
u8 pci_func;
|
||||||
int i, ret;
|
int i, ret;
|
||||||
u32 count;
|
u32 count;
|
||||||
|
|
||||||
|
@ -729,26 +730,28 @@ static ssize_t qlcnic_sysfs_read_npar_config(struct file *file,
|
||||||
|
|
||||||
count = size / sizeof(struct qlcnic_npar_func_cfg);
|
count = size / sizeof(struct qlcnic_npar_func_cfg);
|
||||||
for (i = 0; i < adapter->ahw->total_nic_func; i++) {
|
for (i = 0; i < adapter->ahw->total_nic_func; i++) {
|
||||||
if (qlcnic_is_valid_nic_func(adapter, i) < 0)
|
|
||||||
continue;
|
|
||||||
if (adapter->npars[i].pci_func >= count) {
|
if (adapter->npars[i].pci_func >= count) {
|
||||||
dev_dbg(dev, "%s: Total nic functions[%d], App sent function count[%d]\n",
|
dev_dbg(dev, "%s: Total nic functions[%d], App sent function count[%d]\n",
|
||||||
__func__, adapter->ahw->total_nic_func, count);
|
__func__, adapter->ahw->total_nic_func, count);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
ret = qlcnic_get_nic_info(adapter, &nic_info, i);
|
|
||||||
if (ret)
|
|
||||||
return ret;
|
|
||||||
if (!adapter->npars[i].eswitch_status)
|
if (!adapter->npars[i].eswitch_status)
|
||||||
continue;
|
continue;
|
||||||
np_cfg[i].pci_func = i;
|
pci_func = adapter->npars[i].pci_func;
|
||||||
np_cfg[i].op_mode = (u8)nic_info.op_mode;
|
if (qlcnic_is_valid_nic_func(adapter, pci_func) < 0)
|
||||||
np_cfg[i].port_num = nic_info.phys_port;
|
continue;
|
||||||
np_cfg[i].fw_capab = nic_info.capabilities;
|
ret = qlcnic_get_nic_info(adapter, &nic_info, pci_func);
|
||||||
np_cfg[i].min_bw = nic_info.min_tx_bw;
|
if (ret)
|
||||||
np_cfg[i].max_bw = nic_info.max_tx_bw;
|
return ret;
|
||||||
np_cfg[i].max_tx_queues = nic_info.max_tx_ques;
|
|
||||||
np_cfg[i].max_rx_queues = nic_info.max_rx_ques;
|
np_cfg[pci_func].pci_func = pci_func;
|
||||||
|
np_cfg[pci_func].op_mode = (u8)nic_info.op_mode;
|
||||||
|
np_cfg[pci_func].port_num = nic_info.phys_port;
|
||||||
|
np_cfg[pci_func].fw_capab = nic_info.capabilities;
|
||||||
|
np_cfg[pci_func].min_bw = nic_info.min_tx_bw;
|
||||||
|
np_cfg[pci_func].max_bw = nic_info.max_tx_bw;
|
||||||
|
np_cfg[pci_func].max_tx_queues = nic_info.max_tx_ques;
|
||||||
|
np_cfg[pci_func].max_rx_queues = nic_info.max_rx_ques;
|
||||||
}
|
}
|
||||||
return size;
|
return size;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue