[Intel-wired-lan] [PATCH] igb: report unsupported ethtool settings in set_coalesce

Todd Fujinaka todd.fujinaka at intel.com
Fri May 22 17:49:50 UTC 2015


There are many settings possible using ethtool -C/--coalesce, but not
all of them are supported. Report failure when an unsupported option is
set.

Signed-off-by: Todd Fujinaka <todd.fujinaka at intel.com>
---
 drivers/net/ethernet/intel/igb/igb_ethtool.c |   21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c
index 109cad9..13560fe 100644
--- a/drivers/net/ethernet/intel/igb/igb_ethtool.c
+++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c
@@ -2159,6 +2159,27 @@ static int igb_set_coalesce(struct net_device *netdev,
 	struct igb_adapter *adapter = netdev_priv(netdev);
 	int i;
 
+	if ((ec->rx_max_coalesced_frames != -1) ||
+	    (ec->rx_coalesce_usecs_irq != -1) ||
+	    (ec->rx_max_coalesced_frames_irq != -1) ||
+	    (ec->tx_max_coalesced_frames != -1) ||
+	    (ec->tx_coalesce_usecs_irq != -1) ||
+	    (ec->stats_block_coalesce_usecs != -1) ||
+	    (ec->use_adaptive_rx_coalesce != -1) ||
+	    (ec->use_adaptive_tx_coalesce != -1) ||
+	    (ec->pkt_rate_low != -1) ||
+	    (ec->rx_coalesce_usecs_low != -1) ||
+	    (ec->rx_max_coalesced_frames_low != -1) ||
+	    (ec->tx_coalesce_usecs_low != -1) ||
+	    (ec->tx_max_coalesced_frames_low != -1) ||
+	    (ec->pkt_rate_high != -1) ||
+	    (ec->rx_coalesce_usecs_high != -1) ||
+	    (ec->rx_max_coalesced_frames_high != -1) ||
+	    (ec->tx_coalesce_usecs_high != -1) ||
+	    (ec->tx_max_coalesced_frames_high != -1) ||
+	    (ec->rate_sample_interval != -1))
+		return -ENOTSUPP;
+
 	if ((ec->rx_coalesce_usecs > IGB_MAX_ITR_USECS) ||
 	    ((ec->rx_coalesce_usecs > 3) &&
 	     (ec->rx_coalesce_usecs < IGB_MIN_ITR_USECS)) ||



More information about the Intel-wired-lan mailing list