Merge branch 'for-next' into for-linus
Conflicts: kernel/irq/chip.c
This commit is contained in:
@@ -1285,7 +1285,7 @@ netdev_tx_t t3_eth_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||
|
||||
/*
|
||||
* We do not use Tx completion interrupts to free DMAd Tx packets.
|
||||
* This is good for performamce but means that we rely on new Tx
|
||||
* This is good for performance but means that we rely on new Tx
|
||||
* packets arriving to run the destructors of completed packets,
|
||||
* which open up space in their sockets' send queues. Sometimes
|
||||
* we do not get such new packets causing Tx to stall. A single
|
||||
|
Reference in New Issue
Block a user