Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/net/ethernet/qlogic/qlcnic/qlcnic.h

+1 −1
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ struct qlcnic_hardware_context { 
	u16 max_pci_func;



	u32 capabilities;

	u32 capabilities2;

	u32 extra_capability[3];

	u32 temp;

	u32 int_vec_bit;

	u32 fw_hal_version;

drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c

+2 −1
Original line number Diff line number Diff line
@@ -786,7 +786,8 @@ int qlcnic_82xx_config_hw_lro(struct qlcnic_adapter *adapter, int enable) 
	word = 0;

	if (enable) {

		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 |

				QLCNIC_NO_DEST_IPV6_CHECK;

	}

drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c

+2 −2
Original line number Diff line number Diff line
@@ -994,7 +994,7 @@ qlcnic_initialize_nic(struct qlcnic_adapter *adapter) 
	if (adapter->ahw->capabilities & QLCNIC_FW_CAPABILITY_MORE_CAPS) {

		u32 temp;

		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_mtu = nic_info.max_mtu;
@@ -1486,7 +1486,7 @@ static void qlcnic_get_lro_mss_capability(struct qlcnic_adapter *adapter) 
	u32 capab = 0;



	if (qlcnic_82xx_check(adapter)) {

		if (adapter->ahw->capabilities2 &

		if (adapter->ahw->extra_capability[0] &

		    QLCNIC_FW_CAPABILITY_2_LRO_MAX_TCP_SEG)

			adapter->flags |= QLCNIC_FW_LRO_MSS_CAP;

	} else {

drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static int qlcnic_82xx_store_beacon(struct qlcnic_adapter *adapter, 
	if (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);

		if (!err) {

			dev_info(&adapter->pdev->dev,