lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qlcnic: remove private LRO flag

Browse Source 
LRO was not getting enable after interface down/up.

Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Amit Kumar Salecha
2010-10-07 23:46:07 +00:00
committed by David S. Miller
parent b8c1762045
commit a2152d096e
3 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/qlcnic/qlcnic_ethtool.c
View File

@@ -865,7 +865,7 @@ static int qlcnic_set_rx_csum(struct net_device *dev, u32 data)
return 0; return 0;
} }
if (adapter->flags & QLCNIC_LRO_ENABLED) { if (dev->features & NETIF_F_LRO) {
if (qlcnic_config_hw_lro(adapter, QLCNIC_LRO_DISABLED)) if (qlcnic_config_hw_lro(adapter, QLCNIC_LRO_DISABLED))
return -EIO; return -EIO;
@@ -1062,7 +1062,7 @@ static int qlcnic_set_flags(struct net_device *netdev, u32 data)
return -EINVAL; return -EINVAL;
} }
if ((data & ETH_FLAG_LRO) && (adapter->flags & QLCNIC_LRO_ENABLED)) if ((data & ETH_FLAG_LRO) && (netdev->features & NETIF_F_LRO))
return 0; return 0;
if (data & ETH_FLAG_LRO) { if (data & ETH_FLAG_LRO) {

5
drivers/net/qlcnic/qlcnic_hw.c
View File

@@ -582,9 +582,6 @@ int qlcnic_config_hw_lro(struct qlcnic_adapter *adapter, int enable)
u64 word; u64 word;
int rv; int rv;
if ((adapter->flags & QLCNIC_LRO_ENABLED) == enable)
return 0;
memset(&req, 0, sizeof(struct qlcnic_nic_req)); memset(&req, 0, sizeof(struct qlcnic_nic_req));
req.qhdr = cpu_to_le64(QLCNIC_HOST_REQUEST << 23); 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, dev_err(&adapter->netdev->dev,
"Could not send configure hw lro request\n"); "Could not send configure hw lro request\n");
adapter->flags ^= QLCNIC_LRO_ENABLED;
return rv; return rv;
} }

2
drivers/net/qlcnic/qlcnic_main.c
View File

@@ -657,8 +657,6 @@ qlcnic_check_options(struct qlcnic_adapter *adapter)
dev_info(&pdev->dev, "firmware v%d.%d.%d\n", dev_info(&pdev->dev, "firmware v%d.%d.%d\n",
fw_major, fw_minor, fw_build); fw_major, fw_minor, fw_build);
adapter->flags &= ~QLCNIC_LRO_ENABLED;
if (adapter->ahw.port_type == QLCNIC_XGBE) { if (adapter->ahw.port_type == QLCNIC_XGBE) {
adapter->num_rxd = DEFAULT_RCV_DESCRIPTORS_10G; adapter->num_rxd = DEFAULT_RCV_DESCRIPTORS_10G;
adapter->num_jumbo_rxd = MAX_JUMBO_RCV_DESCRIPTORS_10G; adapter->num_jumbo_rxd = MAX_JUMBO_RCV_DESCRIPTORS_10G;