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, 26 insertions, 1 deletions

diff --git a/drivers/net/netxen/netxen_nic_ethtool.c b/drivers/net/netxen/netxen_nic_ethtool.c
index 39a308c363c7..db66e7053b99 100644
--- a/drivers/net/netxen/netxen_nic_ethtool.c
+++ b/drivers/net/netxen/netxen_nic_ethtool.c
@@ -57,7 +57,8 @@ static const struct netxen_nic_stats netxen_nic_gstrings_stats[] = {
         {"rx_dropped", NETXEN_NIC_STAT(stats.rxdropped)},
         {"tx_dropped", NETXEN_NIC_STAT(stats.txdropped)},
         {"csummed", NETXEN_NIC_STAT(stats.csummed)},
-        {"no_rcv", NETXEN_NIC_STAT(stats.no_rcv)},
+        {"rx_pkts", NETXEN_NIC_STAT(stats.rx_pkts)},
+        {"lro_pkts", NETXEN_NIC_STAT(stats.lro_pkts)},
         {"rx_bytes", NETXEN_NIC_STAT(stats.rxbytes)},
         {"tx_bytes", NETXEN_NIC_STAT(stats.txbytes)},
 };
@@ -941,6 +942,28 @@ static int netxen_get_intr_coalesce(struct net_device *netdev,
         return 0;
 }
 
+static int netxen_nic_set_flags(struct net_device *netdev, u32 data)
+{
+        struct netxen_adapter *adapter = netdev_priv(netdev);
+        int hw_lro;
+
+        if (!(adapter->capabilities & NX_FW_CAPABILITY_HW_LRO))
+                return -EINVAL;
+
+        ethtool_op_set_flags(netdev, data);
+
+        hw_lro = (data & ETH_FLAG_LRO) ? NETXEN_NIC_LRO_ENABLED : 0;
+
+        if (netxen_config_hw_lro(adapter, hw_lro))
+                return -EIO;
+
+        if ((hw_lro == 0) && netxen_send_lro_cleanup(adapter))
+                return -EIO;
+
+
+        return 0;
+}
+
 struct ethtool_ops netxen_nic_ethtool_ops = {
         .get_settings = netxen_nic_get_settings,
         .set_settings = netxen_nic_set_settings,
@@ -968,4 +991,6 @@ struct ethtool_ops netxen_nic_ethtool_ops = {
         .set_rx_csum = netxen_nic_set_rx_csum,
         .get_coalesce = netxen_get_intr_coalesce,
         .set_coalesce = netxen_set_intr_coalesce,
+        .get_flags = ethtool_op_get_flags,
+        .set_flags = netxen_nic_set_flags,
 };