diff options
| author |   David S. Miller <davem@davemloft.net> | 2013-10-22 15:52:06 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-10-22 15:52:06 -0400 |
| commit | 666d10085924d9dd4bcab7653f5d4971d8ea2498 (patch) | |
| tree | 4f09b99a667451907c1dc19a0ae62e22a9c12a0d /drivers/net/bonding/bond_main.c | |
| parent | net: remove function sk_reset_txq() (diff) | |
| parent | i40e: Bump version (diff) | |
| download | linux-dev-666d10085924d9dd4bcab7653f5d4971d8ea2498.tar.xz linux-dev-666d10085924d9dd4bcab7653f5d4971d8ea2498.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Jeff Kirsher says:
====================
Intel Wired LAN Driver Updates
This series contains updates to i40e only.
Jesse provides 6 patches against i40e. First is a patch to reduce
CPU utilization by reducing read-flush to read in the hot path. Next
couple of patches resolve coverity issues reported by Hannes Frederic
Sowa <hannes@stressinduktion.org>. Then Jesse refactored i40e to cleanup
functions which used cpu_to_xxx(foo) which caused a lot of line wrapping.
Mitch provides 2 i40e patches. First fixes a panic when tx_rings[0]
are not allocated, his second patch corrects a math error when
assigning MSI-X vectors to VFs. The vectors-per-vf value reported
by the hardware already conveniently reports one less than the actual
value.
Shannon provides 5 patches against i40e. His first patch corrects a
number of little bugs in the error handling of irq setup, most of
which ended up panicing the kernel. Next he fixes the overactive
IRQ issue seen in testing and allows the use of the legacy interrupt.
Shannon then provides a cleanup of the arguments declared at the
beginning of each function. Then he provides a patch to make sure
that there are really rings and queues before trying to dump
information in them. Lastly he simplifies the code by using an
already existing variable.
Catherine provides an i40e patch to bump the version.
v2:
- Remove unneeded parenthesis in patch 3 based on feedback from
Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
- Fix patch description for patch 11 based on feedback from
Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding/bond_main.c')
0 files changed, 0 insertions, 0 deletions