1 files changed, 9 insertions, 2 deletions

diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c
index 2835dee5dc39..b2476dbfd103 100644
--- a/drivers/net/ethernet/emulex/benet/be_ethtool.c
+++ b/drivers/net/ethernet/emulex/benet/be_ethtool.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005 - 2014 Emulex
+ * Copyright (C) 2005 - 2015 Emulex
  * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or
@@ -123,7 +123,6 @@ static const struct be_ethtool_stat et_stats[] = {
         {DRVSTAT_INFO(dma_map_errors)},
         /* Number of packets dropped due to random early drop function */
         {DRVSTAT_INFO(eth_red_drops)},
-        {DRVSTAT_INFO(be_on_die_temperature)},
         {DRVSTAT_INFO(rx_roce_bytes_lsd)},
         {DRVSTAT_INFO(rx_roce_bytes_msd)},
         {DRVSTAT_INFO(rx_roce_frames)},
@@ -368,6 +367,14 @@ static int be_set_coalesce(struct net_device *netdev,
                 aic++;
         }
 
+        /* For Skyhawk, the EQD setting happens via EQ_DB when AIC is enabled.
+         * When AIC is disabled, persistently force set EQD value via the
+         * FW cmd, so that we don't have to calculate the delay multiplier
+         * encode value each time EQ_DB is rung
+         */
+        if (!et->use_adaptive_rx_coalesce && skyhawk_chip(adapter))
+                be_eqd_update(adapter, true);
+
         return 0;
 }