mirror of
https://github.com/torvalds/linux.git
synced 2026-04-24 09:35:52 -04:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts: net/mac80211/mlme.c
This commit is contained in:
@@ -2405,6 +2405,12 @@ static int __devinit ixgbe_set_interrupt_capability(struct ixgbe_adapter
|
||||
int err = 0;
|
||||
int vector, v_budget;
|
||||
|
||||
/*
|
||||
* Set the default interrupt throttle rate.
|
||||
*/
|
||||
adapter->rx_eitr = (1000000 / IXGBE_DEFAULT_ITR_RX_USECS);
|
||||
adapter->tx_eitr = (1000000 / IXGBE_DEFAULT_ITR_TX_USECS);
|
||||
|
||||
/*
|
||||
* It's easy to be greedy for MSI-X vectors, but it really
|
||||
* doesn't do us much good if we have a lot more vectors
|
||||
|
||||
Reference in New Issue
Block a user