diff options
author | David S. Miller <davem@davemloft.net> | 2014-10-03 15:43:50 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-10-03 15:43:50 -0700 |
commit | 579899a9eac2a9051f65ec6d120f80383696d528 (patch) | |
tree | 9da32b135999149d72521a7c02a6f7247e59f7bd /drivers/net/bonding/bond_options.h | |
parent | 48fea861c9fbee5aae17897fb9acc4d348a9abac (diff) | |
parent | b5d130c4d6e664c49428fb0c27d37c1be12ae8da (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-10-02
This series contains updates to fm10k, igb, ixgbe and i40e.
Alex provides two updates to the fm10k driver. First reduces the buffer
size to 2k for all page sizes, since most frames only have a 1500 MTU
so supporting a buffer size larger than this is somewhat wasteful.
Second fixes an issue where the number of transmit queues was not being
updated, so added the lines necessary to update the number of transmit
queues.
Rick Jones provides two patches to convert ixgbe, igb and i40e to use
dev_consume_skb_any().
Emil provides two patches for ixgbe, first cleans up a couple of wait
loops on auto-negotiation that were not needed. Second fixes an issue
reported by Fujitsu/Red Hat, which consolidates the logic behind the
dynamically setting of TXDCTL.WTHRESH depending on interrupt throttle
rate (ITR) setting regardless of BQL.
Ethan Zhao provides a cleanup patch for ixgbe where he noticed a
duplicate define.
Bernhard Kaindl provides a patch for igb to remove a source of latency
spikes by not calling code that uses mdelay() for feeding a PHY stat
while being called with a spinlock held.
Todd bumps the igb version based on the recent changes.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding/bond_options.h')
0 files changed, 0 insertions, 0 deletions