diff options
| author | David S. Miller <davem@davemloft.net> | 2012-08-31 16:03:33 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-08-31 16:03:33 -0400 |
| commit | fcb118491bc8bc16c4eeb8142366bcbe17fe615d (patch) | |
| tree | 8eb8aba6fe58519aea313820bb4b9c0859721cbd /drivers/net/ethernet/intel/e1000e/ethtool.c | |
| parent | 80f0fd8a7f18af78dd26bf94230e89c3ae82d4ba (diff) | |
| parent | dd1fe113e7532c7513ff03f832312d81628a23ff (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e/ethtool.c')
| -rw-r--r-- | drivers/net/ethernet/intel/e1000e/ethtool.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/ethtool.c b/drivers/net/ethernet/intel/e1000e/ethtool.c index 2e76f06720f..c11ac275666 100644 --- a/drivers/net/ethernet/intel/e1000e/ethtool.c +++ b/drivers/net/ethernet/intel/e1000e/ethtool.c @@ -1942,7 +1942,8 @@ static int e1000_set_coalesce(struct net_device *netdev, return -EINVAL; if (ec->rx_coalesce_usecs == 4) { - adapter->itr = adapter->itr_setting = 4; + adapter->itr_setting = 4; + adapter->itr = adapter->itr_setting; } else if (ec->rx_coalesce_usecs <= 3) { adapter->itr = 20000; adapter->itr_setting = ec->rx_coalesce_usecs; |