diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-26 05:08:45 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-26 05:08:45 -0400 |
| commit | 8fdd2e25fb0cf82c8af62235366fe1a223c80752 (patch) | |
| tree | aea4c3f4fdeefe6f168df9c5376fbfc10cf629ab /drivers/net/ethernet/intel/e1000e/netdev.c | |
| parent | 47d59d01322f60d1c46fdf2650e0613daa8ce637 (diff) | |
| parent | 727c356f4d799b53f94cf8fe43e19d64482348c7 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e/netdev.c')
| -rw-r--r-- | drivers/net/ethernet/intel/e1000e/netdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index 19ab2154802..9520a6ac1f3 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -3799,7 +3799,7 @@ static int e1000_test_msi_interrupt(struct e1000_adapter *adapter) /* fire an unusual interrupt on the test handler */ ew32(ICS, E1000_ICS_RXSEQ); e1e_flush(); - msleep(50); + msleep(100); e1000_irq_disable(adapter); |