diff options
author | David S. Miller <davem@davemloft.net> | 2013-12-19 19:05:15 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-12-19 19:05:15 -0500 |
commit | 9ddffb8a1103e9c716b152a80e46c95cba1ca6b2 (patch) | |
tree | c8c21acd38576bc0518d79d4784dfc8938327ce0 /net/bridge/br_ioctl.c | |
parent | rps: NUMA flow limit allocations (diff) | |
parent | net/mlx4_core: Check port number for validity before accessing data (diff) | |
download | linux-dev-9ddffb8a1103e9c716b152a80e46c95cba1ca6b2.tar.xz linux-dev-9ddffb8a1103e9c716b152a80e46c95cba1ca6b2.zip |
Merge branch 'mlx4'
Amir Vadai says:
====================
net/mlx4: Mellanox driver update 08-12-2013
This patchset contains:
1. Support in ndo_get_phys_port_id added by Hadar.
2. Change the driver to use by default CQE/EQE size of 64 bytes done by Eyal.
This doubles the packet-rate of the NIC.
3. Configure the XPS queue mapping on driver load - added by Ido.
4. Fixes for some small bugs done by Jenny and Matan
Patchset was applied and tested against commit: "2372175 lib: hash: follow-up
fixups for arch hash"
Changes from V1:
- Removed Patch 10 "net/mlx4_en: Fix Supported/Advertised link mode reported by
ethtool". This patch is needed to be rewritten from scratch and I wouldn't
like it to block the rest of the patches in this set.
Also, fix to Kconfig suggested by Ben will be sent in next patchset.
Changes from V0:
- Found some issues in "Reuse memory in RX flow" patch from V0.
Removing this patch from the patchset till analyzed and fixed.
- Fix some coding style issues in patch 6 "Configure the XPS queue mapping on
driver load"
- Changed patch 9 "Add NAPI support for transmit side" to use NAPI_POLL_WEIGHT
instead of MLX4_EN_TX_BUDGET
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_ioctl.c')
0 files changed, 0 insertions, 0 deletions