diff options
author | David S. Miller <davem@davemloft.net> | 2014-02-24 18:38:27 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-02-24 18:38:27 -0500 |
commit | a1991c749a7bfacb766a056aff11864216670dd6 (patch) | |
tree | 4d3cd829ab33089beed742531dd28b02db5a12ea /drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | |
parent | 7a4ddcd92ea72fdc54ebf671f3d3fcc8ba3a1ea8 (diff) | |
parent | bb2146bc883e86b835e30644757a6d4a649a7ce8 (diff) |
Merge branch 'mlx4'
Amir Vadai says:
====================
net/mlx4: Mellanox driver update 01-01-2014
This small patchset has a fix to a bogus usage of
netif_get_num_default_rss_queues() in mlx4_en driver.
Changes from V1:
- Removed affinity_hint patch, to make it a generic instead of mlx specific
Changes from V0:
- Instead of reverting the netif_get_num_default_rss_queues() in mlx4_en,
fixing it to limit the actual number of receive queues instead of limiting
the number of IRQ's.
Patchset was applied and tested against commit: cb6e926 "ipv6:fix checkpatch
errors with assignment in if condition"
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c')
0 files changed, 0 insertions, 0 deletions