diff options
| author | David S. Miller | 2014-04-14 19:43:58 +0200 |
|---|---|---|
| committer | David S. Miller | 2014-04-14 19:43:58 +0200 |
| commit | 14ed4a5bcbd56e87e7c56b4604f43e47162a2e54 (patch) | |
| tree | 83dca5a5591e1fdb07979f76e6394262dc7d3a97 /drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c | |
| parent | Merge branch 'be2net' (diff) | |
| parent | qlcnic: Do not disable SR-IOV when VFs are assigned to VMs (diff) | |
| download | kernel-qcow2-linux-14ed4a5bcbd56e87e7c56b4604f43e47162a2e54.tar.gz kernel-qcow2-linux-14ed4a5bcbd56e87e7c56b4604f43e47162a2e54.tar.xz kernel-qcow2-linux-14ed4a5bcbd56e87e7c56b4604f43e47162a2e54.zip | |
Merge branch 'qlcnic'
Shahed Shaikh says:
====================
qlcnic: Bug fixes
This patch series contains following bug fixes -
* Send INIT_NIC_FUNC mailbox command as first mailbox
* Fix a panic because of uninitialized delayed_work.
* Fix inconsistent calculation of max rings count.
* Fix PVID configuration issue. Driver needs to clear older
PVID before adding new one.
* Fix QLogic application/driver interface by packing vNIC information
array.
* Fix a crash when user tries to disable SR-IOV while VFs are
still assigned to VMs.
Please apply to net.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c')
| -rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c index 64dcbf33d8f0..c1e11f5715b0 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c @@ -883,8 +883,6 @@ int qlcnic_82xx_get_nic_info(struct qlcnic_adapter *adapter, npar_info->max_rx_ques = le16_to_cpu(nic_info->max_rx_ques); npar_info->capabilities = le32_to_cpu(nic_info->capabilities); npar_info->max_mtu = le16_to_cpu(nic_info->max_mtu); - adapter->max_tx_rings = npar_info->max_tx_ques; - adapter->max_sds_rings = npar_info->max_rx_ques; } qlcnic_free_mbx_args(&cmd); @@ -1356,6 +1354,7 @@ int qlcnic_config_switch_port(struct qlcnic_adapter *adapter, arg2 &= ~BIT_3; break; case QLCNIC_ADD_VLAN: + arg1 &= ~(0x0ffff << 16); arg1 |= (BIT_2 | BIT_5); arg1 |= (esw_cfg->vlan_id << 16); break; |