Commit db131786 authored by Pratik Pujar's avatar Pratik Pujar Committed by David S. Miller

qlcnic: Cleanup of structure qlcnic_hardware_context

Signed-off-by: default avatarPratik Pujar <pratik.pujar@qlogic.com>
Signed-off-by: default avatarJitendra Kalsaria <jitendra.kalsaria@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9baf1aa9
...@@ -449,7 +449,7 @@ struct qlcnic_hardware_context { ...@@ -449,7 +449,7 @@ struct qlcnic_hardware_context {
u16 max_pci_func; u16 max_pci_func;
u32 capabilities; u32 capabilities;
u32 capabilities2; u32 extra_capability[3];
u32 temp; u32 temp;
u32 int_vec_bit; u32 int_vec_bit;
u32 fw_hal_version; u32 fw_hal_version;
......
...@@ -786,7 +786,8 @@ int qlcnic_82xx_config_hw_lro(struct qlcnic_adapter *adapter, int enable) ...@@ -786,7 +786,8 @@ int qlcnic_82xx_config_hw_lro(struct qlcnic_adapter *adapter, int enable)
word = 0; word = 0;
if (enable) { if (enable) {
word = QLCNIC_ENABLE_IPV4_LRO | QLCNIC_NO_DEST_IPV4_CHECK; word = QLCNIC_ENABLE_IPV4_LRO | QLCNIC_NO_DEST_IPV4_CHECK;
if (adapter->ahw->capabilities2 & QLCNIC_FW_CAP2_HW_LRO_IPV6) if (adapter->ahw->extra_capability[0] &
QLCNIC_FW_CAP2_HW_LRO_IPV6)
word |= QLCNIC_ENABLE_IPV6_LRO | word |= QLCNIC_ENABLE_IPV6_LRO |
QLCNIC_NO_DEST_IPV6_CHECK; QLCNIC_NO_DEST_IPV6_CHECK;
} }
......
...@@ -994,7 +994,7 @@ qlcnic_initialize_nic(struct qlcnic_adapter *adapter) ...@@ -994,7 +994,7 @@ qlcnic_initialize_nic(struct qlcnic_adapter *adapter)
if (adapter->ahw->capabilities & QLCNIC_FW_CAPABILITY_MORE_CAPS) { if (adapter->ahw->capabilities & QLCNIC_FW_CAPABILITY_MORE_CAPS) {
u32 temp; u32 temp;
temp = QLCRD32(adapter, CRB_FW_CAPABILITIES_2); temp = QLCRD32(adapter, CRB_FW_CAPABILITIES_2);
adapter->ahw->capabilities2 = temp; adapter->ahw->extra_capability[0] = temp;
} }
adapter->ahw->max_mac_filters = nic_info.max_mac_filters; adapter->ahw->max_mac_filters = nic_info.max_mac_filters;
adapter->ahw->max_mtu = nic_info.max_mtu; adapter->ahw->max_mtu = nic_info.max_mtu;
...@@ -1486,7 +1486,7 @@ static void qlcnic_get_lro_mss_capability(struct qlcnic_adapter *adapter) ...@@ -1486,7 +1486,7 @@ static void qlcnic_get_lro_mss_capability(struct qlcnic_adapter *adapter)
u32 capab = 0; u32 capab = 0;
if (qlcnic_82xx_check(adapter)) { if (qlcnic_82xx_check(adapter)) {
if (adapter->ahw->capabilities2 & if (adapter->ahw->extra_capability[0] &
QLCNIC_FW_CAPABILITY_2_LRO_MAX_TCP_SEG) QLCNIC_FW_CAPABILITY_2_LRO_MAX_TCP_SEG)
adapter->flags |= QLCNIC_FW_LRO_MSS_CAP; adapter->flags |= QLCNIC_FW_LRO_MSS_CAP;
} else { } else {
......
...@@ -168,7 +168,7 @@ static int qlcnic_82xx_store_beacon(struct qlcnic_adapter *adapter, ...@@ -168,7 +168,7 @@ static int qlcnic_82xx_store_beacon(struct qlcnic_adapter *adapter,
if (err) if (err)
return err; return err;
if ((ahw->capabilities2 & QLCNIC_FW_CAPABILITY_2_BEACON)) { if (ahw->extra_capability[0] & QLCNIC_FW_CAPABILITY_2_BEACON) {
err = qlcnic_get_beacon_state(adapter, &h_beacon_state); err = qlcnic_get_beacon_state(adapter, &h_beacon_state);
if (!err) { if (!err) {
dev_info(&adapter->pdev->dev, dev_info(&adapter->pdev->dev,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment