From: David S. Miller <davem@davemloft.net>
Date: Mon, 24 Feb 2014 23:38:27 +0000 (-0500)
Subject: Merge branch 'mlx4'
X-Git-Tag: firefly_0821_release~176^2~4167^2~283
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a1991c749a7bfacb766a056aff11864216670dd6;p=firefly-linux-kernel-4.4.55.git

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>
---

a1991c749a7bfacb766a056aff11864216670dd6