qlcnic: Fix resource allocation for TX queues

o TX queues allocation was getting distributed equally among all the
  functions of the port including VFs and PF. Which was leading to failure
  in PF's multiple TX queues creation.

o Instead of dividing queues equally allocate one TX queue for each VF as VF
  doesn't support multiple TX queues.

Signed-off-by: Manish Chopra <manish.chopra@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Manish Chopra 2014-01-02 13:38:44 -05:00 committed by David S. Miller
parent d9c602f033
commit f3e3ccf83b

View file

@ -75,7 +75,6 @@ static int qlcnic_sriov_pf_cal_res_limit(struct qlcnic_adapter *adapter,
num_vfs = sriov->num_vfs; num_vfs = sriov->num_vfs;
max = num_vfs + 1; max = num_vfs + 1;
info->bit_offsets = 0xffff; info->bit_offsets = 0xffff;
info->max_tx_ques = res->num_tx_queues / max;
info->max_rx_mcast_mac_filters = res->num_rx_mcast_mac_filters; info->max_rx_mcast_mac_filters = res->num_rx_mcast_mac_filters;
num_vf_macs = QLCNIC_SRIOV_VF_MAX_MAC; num_vf_macs = QLCNIC_SRIOV_VF_MAX_MAC;
@ -86,6 +85,7 @@ static int qlcnic_sriov_pf_cal_res_limit(struct qlcnic_adapter *adapter,
info->max_tx_mac_filters = temp; info->max_tx_mac_filters = temp;
info->min_tx_bw = 0; info->min_tx_bw = 0;
info->max_tx_bw = MAX_BW; info->max_tx_bw = MAX_BW;
info->max_tx_ques = res->num_tx_queues - sriov->num_vfs;
} else { } else {
id = qlcnic_sriov_func_to_index(adapter, func); id = qlcnic_sriov_func_to_index(adapter, func);
if (id < 0) if (id < 0)
@ -95,6 +95,7 @@ static int qlcnic_sriov_pf_cal_res_limit(struct qlcnic_adapter *adapter,
info->max_tx_bw = vp->max_tx_bw; info->max_tx_bw = vp->max_tx_bw;
info->max_rx_ucast_mac_filters = num_vf_macs; info->max_rx_ucast_mac_filters = num_vf_macs;
info->max_tx_mac_filters = num_vf_macs; info->max_tx_mac_filters = num_vf_macs;
info->max_tx_ques = QLCNIC_SINGLE_RING;
} }
info->max_rx_ip_addr = res->num_destip / max; info->max_rx_ip_addr = res->num_destip / max;