From 0a1196cd859589eea4794e5640698a9b99769de4 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Fri, 23 Sep 2011 15:34:38 +0000 Subject: [PATCH] --- yaml --- r: 291389 b: refs/heads/master c: 35551c47495a762fcfa5ca6217bf3eb36983d0df h: refs/heads/master i: 291387: aa9c18f42e97a8f74deaa98d156b448a60f141a2 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 1593a3c7c6f7..e620fa5fee38 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 51a76c30929cc8b7d541f51e634f146e54ea9bb7 +refs/heads/master: 35551c47495a762fcfa5ca6217bf3eb36983d0df diff --git a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c index 8e2e4732b1a7..4846206a1014 100644 --- a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c +++ b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c @@ -2108,8 +2108,6 @@ static int ixgbe_get_coalesce(struct net_device *netdev, { struct ixgbe_adapter *adapter = netdev_priv(netdev); - ec->tx_max_coalesced_frames_irq = adapter->tx_work_limit; - /* only valid if in constant ITR mode */ if (adapter->rx_itr_setting <= 1) ec->rx_coalesce_usecs = adapter->rx_itr_setting; @@ -2177,9 +2175,6 @@ static int ixgbe_set_coalesce(struct net_device *netdev, && ec->tx_coalesce_usecs) return -EINVAL; - if (ec->tx_max_coalesced_frames_irq) - adapter->tx_work_limit = ec->tx_max_coalesced_frames_irq; - if ((ec->rx_coalesce_usecs > (IXGBE_MAX_EITR >> 2)) || (ec->tx_coalesce_usecs > (IXGBE_MAX_EITR >> 2))) return -EINVAL; @@ -2214,7 +2209,6 @@ static int ixgbe_set_coalesce(struct net_device *netdev, for (i = 0; i < num_vectors; i++) { q_vector = adapter->q_vector[i]; - q_vector->tx.work_limit = adapter->tx_work_limit; if (q_vector->tx.count && !q_vector->rx.count) /* tx only */ q_vector->itr = tx_itr_param;