OSDN Git Service

ibmvnic: merge do_change_param_reset into do_reset
authorLijun Pan <ljp@linux.ibm.com>
Wed, 6 Jan 2021 21:35:14 +0000 (15:35 -0600)
committerJakub Kicinski <kuba@kernel.org>
Sat, 9 Jan 2021 20:34:45 +0000 (12:34 -0800)
commit3f5ec374ae3f3d5381622e29319a22c4ecd09413
tree97715cb1e8b4a31917684bfd76f6f2426d5d12bb
parent09b5b5fb3902bb206c61daad26d30b803bcadaf5
ibmvnic: merge do_change_param_reset into do_reset

Commit b27507bb59ed ("net/ibmvnic: unlock rtnl_lock in reset so
linkwatch_event can run") introduced do_change_param_reset function to
solve the rtnl lock issue. Majority of the code in do_change_param_reset
duplicates do_reset. Also, we can handle the rtnl lock issue in do_reset
itself. Hence merge do_change_param_reset back into do_reset to clean up
the code.

Signed-off-by: Lijun Pan <ljp@linux.ibm.com>
Link: https://lore.kernel.org/r/20210106213514.76027-1-ljp@linux.ibm.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/ibm/ibmvnic.c