summaryrefslogtreecommitdiff
path: root/net/sched/sch_netem.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-11-03 16:10:11 -0500
committerDavid S. Miller <davem@davemloft.net>2014-11-03 16:10:11 -0500
commit8ce0c8254f15229aa99fc6c04141f28c446e5f8c (patch)
tree9ccbbcb332996b88de3ddc830539494fedbbc3c7 /net/sched/sch_netem.c
parentec5a0ec1a4b0a065148905340cd5f0e2a4425b6f (diff)
parent2089ad03b200fca3b2193a2f6f9779c38f62f9d6 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Jeff Kirsher says: ==================== Intel Wired LAN Driver Updates 2014-11-03 This series contains updates to i40e and i40evf. Akeem adds a check for i40e so that flow director flush and reinit are not done when flow director is not enabled. Mitch fixes the i40evf driver to properly handle multiple admin queue messages, by reinit the msg_size field each time we go through the loop. Without this, we may receive truncated messages due to the firmware thinking we have insufficient buffer size. Also fixes the link checking logic to only check the carrier state if the interface is actually open, which allows link changes to be reported correctly without spamming the VFs. Updates i40e to inset the VSI ID in the QTX_CTL register when configuring queues for VMDq VSIs. Paul adds support for 10G-base-T in i40evf. Jesse fixes i40e where the call to irq_dynamic_disable() was turning off the interrupt completely when trying to set ITR to 0 (for lowest moderation). Shannon removes debugfs dump stats function, since it was not being kept up-to-date and was redundant with the ethtool output. Also, scales back the LAN MSIx usage to force queue/vector sharing and leave some vectors for Flow Director, VMDq, etc. when there are more cores than vectors available to the PF. Cleans up the error reporting for get_lump() resource tracking errors. Also adds a check for the debug module parameter earlier to be able to catch the early configuration phase admin queue messages. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_netem.c')
0 files changed, 0 insertions, 0 deletions