diff options
author | David S. Miller <davem@davemloft.net> | 2013-10-29 22:57:49 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-10-29 22:57:49 (GMT) |
commit | aa58d9813d9d236ca12f921d90634ee1dc2bcc24 (patch) | |
tree | 8794ad08e2373c6372a768fdd6be3366a7e3d4b9 /net | |
parent | d4a0acb8ed9c15c2ca82389a30790f66911e640d (diff) | |
parent | ed87ac09d89129fa4d1f0a10d640fb6dabb46fcd (diff) | |
download | linux-aa58d9813d9d236ca12f921d90634ee1dc2bcc24.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Jeff Kirsher says:
====================
This series contains updates to vxlan, net, ixgbe, ixgbevf, and i40e.
Joseph provides a single patch against vxlan which removes the burden
from the NIC drivers to check if the vxlan driver is enabled in the
kernel and also makes available the vxlan headrooms to the drivers.
Jacob provides majority of the patches, with patches against net, ixgbe
and ixgbevf. His net patch adds might_sleep() call to napi_disable so
that every use of napi_disable during atomic context will be visible.
Then Jacob provides a patch to fix qv_lock_napi call in
ixgbe_napi_disable_all. The other ixgbe patches cleanup
ixgbe_check_minimum_link function to correctly show that there are some
minor loss of encoding, even though we don't calculate it and remove
unnecessary duplication of PCIe bandwidth display. Lastly, Jacob
provides 4 patches against ixgbevf to add ixgbevf_rx_skb in line with
how ixgbe handles the variations on how packets can be received, adds
support in order to track how many packets were cleaned during busy poll
as part of the extended statistics.
Wei Yongjun provides a fix for i40e to return -ENOMEN in the memory
allocation error handling case instead of returning 0, as done
elsewhere in this function.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions