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

Commit a2152d09 authored by Amit Kumar Salecha's avatar Amit Kumar Salecha Committed by David S. Miller
Browse files

qlcnic: remove private LRO flag 



LRO was not getting enable after interface down/up.

Signed-off-by: default avatarAmit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b8c17620

drivers/net/qlcnic/qlcnic_ethtool.c

+2 −2
Original line number Diff line number Diff line
@@ -865,7 +865,7 @@ static int qlcnic_set_rx_csum(struct net_device *dev, u32 data) 
		return 0;

	}



	if (adapter->flags & QLCNIC_LRO_ENABLED) {

	if (dev->features & NETIF_F_LRO) {

		if (qlcnic_config_hw_lro(adapter, QLCNIC_LRO_DISABLED))

			return -EIO;
@@ -1062,7 +1062,7 @@ static int qlcnic_set_flags(struct net_device *netdev, u32 data) 
		return -EINVAL;

	}



	if ((data & ETH_FLAG_LRO) && (adapter->flags & QLCNIC_LRO_ENABLED))

	if ((data & ETH_FLAG_LRO) && (netdev->features & NETIF_F_LRO))

		return 0;



	if (data & ETH_FLAG_LRO) {

drivers/net/qlcnic/qlcnic_hw.c

+0 −5
Original line number Diff line number Diff line
@@ -582,9 +582,6 @@ int qlcnic_config_hw_lro(struct qlcnic_adapter *adapter, int enable) 
	u64 word;

	int rv;



	if ((adapter->flags & QLCNIC_LRO_ENABLED) == enable)

		return 0;



	memset(&req, 0, sizeof(struct qlcnic_nic_req));



	req.qhdr = cpu_to_le64(QLCNIC_HOST_REQUEST << 23);
@@ -599,8 +596,6 @@ int qlcnic_config_hw_lro(struct qlcnic_adapter *adapter, int enable) 
		dev_err(&adapter->netdev->dev,

			"Could not send configure hw lro request\n");



	adapter->flags ^= QLCNIC_LRO_ENABLED;



	return rv;

}

drivers/net/qlcnic/qlcnic_main.c

+0 −2
Original line number Diff line number Diff line
@@ -657,8 +657,6 @@ qlcnic_check_options(struct qlcnic_adapter *adapter) 
	dev_info(&pdev->dev, "firmware v%d.%d.%d\n",

			fw_major, fw_minor, fw_build);



	adapter->flags &= ~QLCNIC_LRO_ENABLED;



	if (adapter->ahw.port_type == QLCNIC_XGBE) {

		adapter->num_rxd = DEFAULT_RCV_DESCRIPTORS_10G;

		adapter->num_jumbo_rxd = MAX_JUMBO_RCV_DESCRIPTORS_10G;