From: David S. Miller Date: Sun, 25 Jan 2015 01:22:48 +0000 (-0800) Subject: Merge branch 'be2net-next' X-Git-Tag: firefly_0821_release~176^2~2371^2~157 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=58d942273581ef27d1f8f4d35a32567585e45c9b;p=firefly-linux-kernel-4.4.55.git Merge branch 'be2net-next' Sathya Perla says: ==================== be2net: patch set Hi David, as the below patch-set includes minor bug fixes and some code re-org, pls consider applying it to the "net-next" tree. Thanks! Patch 1 fixes a bit of code duplication involving interface object creation code. Patch 2 ensures that when a flow-control FW cmd fails, the adapter state continues to reflect the old values. This allows for correct reporting on subsequent ethtool "get". Patch 3 returns proper error for link config change on BE3/Lancer Patch 4 adds a kernel log message for FW boot error on Lancer Patch 5 adds a function reset on Lancer as a part of the function init sequence. Patch 6 moves some FW-cmd definitions that belong in be_cmds.h, but were placed in be_hw.h Patch 7 resets the "bw_min" field while configuring "bw_max" needed for TX rate limiting config. ==================== Signed-off-by: David S. Miller --- 58d942273581ef27d1f8f4d35a32567585e45c9b