From: David S. Miller Date: Tue, 28 Oct 2014 21:18:07 +0000 (-0400) Subject: Merge branch 'mellanox-next' X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=e5935e6279ebecb6c0871798e5975aa67592e053;p=deliverable%2Flinux.git Merge branch 'mellanox-next' Amir Vadai says: ==================== Mellanox ethernet driver update Oct-27-2014 This patchset introduces some small bug fixes, support in get/set of vlan offload and get/set/capabilities of the link. First 7 patches by Saeed, add support in setting/getting link speed and getting cable capabilities. Next 2 patches also by Saeed, enable the user to turn rx/tx vlan offloading on and off. Jenni fixed a bug in error flow during device initalization. Ido and Jack fixed some code duplication and errors discovered by static checker. last patch by me is a fix to make ethtool report the actual rings used by indirection QP. Patches were applied and tested against commit 61ed53d ("Merge tag 'ntb-3.18' of git://github.com/jonmason/ntb") ==================== Signed-off-by: David S. Miller --- e5935e6279ebecb6c0871798e5975aa67592e053