netxen: ethtool statistics and control for LRO

Add ethtool -K knob to control LRO in firmware.
LRO path is completely separated from GRO, LRO packets
are still fed with netif_receive_skb().

Also fix ethtool statistics to include LRO packets.
Also use correct message type while configuring interrupt coalescing.

Signed-off-by: Narender Kumar <narender.kumar@qlogic.com>
Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 55 insertions, 1 deletions

diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c
index 673dcf5ea53d..965f783d39f2 100644
--- a/drivers/net/netxen/netxen_nic_hw.c
+++ b/drivers/net/netxen/netxen_nic_hw.c
@@ -643,7 +643,7 @@ int netxen_config_intr_coalesce(struct netxen_adapter *adapter)
 
         memset(&req, 0, sizeof(nx_nic_req_t));
 
-        req.qhdr = cpu_to_le64(NX_NIC_REQUEST << 23);
+        req.qhdr = cpu_to_le64(NX_HOST_REQUEST << 23);
 
         word = NETXEN_CONFIG_INTR_COALESCE | ((u64)adapter->portnum << 16);
         req.req_hdr = cpu_to_le64(word);
@@ -659,6 +659,35 @@ int netxen_config_intr_coalesce(struct netxen_adapter *adapter)
         return rv;
 }
 
+int netxen_config_hw_lro(struct netxen_adapter *adapter, int enable)
+{
+        nx_nic_req_t req;
+        u64 word;
+        int rv = 0;
+
+        if ((adapter->flags & NETXEN_NIC_LRO_ENABLED) == enable)
+                return 0;
+
+        memset(&req, 0, sizeof(nx_nic_req_t));
+
+        req.qhdr = cpu_to_le64(NX_HOST_REQUEST << 23);
+
+        word = NX_NIC_H2C_OPCODE_CONFIG_HW_LRO | ((u64)adapter->portnum << 16);
+        req.req_hdr = cpu_to_le64(word);
+
+        req.words[0] = cpu_to_le64(enable);
+
+        rv = netxen_send_cmd_descs(adapter, (struct cmd_desc_type0 *)&req, 1);
+        if (rv != 0) {
+                printk(KERN_ERR "ERROR. Could not send "
+                        "configure hw lro request\n");
+        }
+
+        adapter->flags ^= NETXEN_NIC_LRO_ENABLED;
+
+        return rv;
+}
+
 #define RSS_HASHTYPE_IP_TCP     0x3
 
 int netxen_config_rss(struct netxen_adapter *adapter, int enable)
@@ -752,6 +781,29 @@ int netxen_linkevent_request(struct netxen_adapter *adapter, int enable)
         return rv;
 }
 
+int netxen_send_lro_cleanup(struct netxen_adapter *adapter)
+{
+        nx_nic_req_t req;
+        u64 word;
+        int rv;
+
+        memset(&req, 0, sizeof(nx_nic_req_t));
+        req.qhdr = cpu_to_le64(NX_HOST_REQUEST << 23);
+
+        word = NX_NIC_H2C_OPCODE_LRO_REQUEST |
+                ((u64)adapter->portnum << 16) |
+                ((u64)NX_NIC_LRO_REQUEST_CLEANUP << 56) ;
+
+        req.req_hdr = cpu_to_le64(word);
+
+        rv = netxen_send_cmd_descs(adapter, (struct cmd_desc_type0 *)&req, 1);
+        if (rv != 0) {
+                printk(KERN_ERR "%s: could not cleanup lro flows\n",
+                                adapter->netdev->name);
+        }
+        return rv;
+}
+
 /*
  * netxen_nic_change_mtu - Change the Maximum Transfer Unit
  * @returns 0 on success, negative on failure
@@ -2066,6 +2118,8 @@ void netxen_nic_get_firmware_info(struct netxen_adapter *adapter)
 
         if (adapter->fw_version >= NETXEN_VERSION_CODE(4, 0, 222))
                 adapter->capabilities = NXRD32(adapter, CRB_FW_CAPABILITIES_1);
+
+        adapter->flags &= ~NETXEN_NIC_LRO_ENABLED;
 }
 
 int