From: David S. Miller Date: Thu, 17 Jul 2014 23:38:23 +0000 (-0700) Subject: Merge branch 'be2net-next' X-Git-Tag: v3.17-rc1~106^2~131 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=87b200e11bb50e90471a69fe1af01e8fce8995aa;p=linux.git Merge branch 'be2net-next' Sathya Perla says: ==================== be2net: patch set Patches 1 to 6 address issues with return values of some ndo/ethtool driver methods. In error scenarios, either an inappropriate error or a +ve return value (where the stack expects a -ve value) was being returned. Patch 7 updates description strings for certain UE bits. Patch 8 cleans up (reduces) argument passing for a few routines in be_cmds.c. Patch 9 removes some unused code (unused definitions.) Patch 10 updates NULL check in the driver to a consistent "if (!foo)" style. Patchs 11 to 13 fix a few minor issues with the earlier patch bec84e6 ("create optimal number of queues on SR-IOV config"): - patch 11 fixes BEx_get_resources() code to use be_max_vfs() macro - patch 12 skips SR-IOV config code for BE2 that doesn't support SRIOV - patch 13 uses adapter->flags to track SRIOV enabled state Patch 14 updates the driver version. ==================== Signed-off-by: David S. Miller --- 87b200e11bb50e90471a69fe1af01e8fce8995aa