Commit 179d9dca authored by Ong Boon Leong's avatar Ong Boon Leong Committed by Zheng Zengkai
Browse files

net: phylink: Fix phylink_err() function name error in phylink_major_config 



stable inclusion
from stable-5.10.27
commit ddeba5b39ccadaac9abce231ead451a4baaff77c
bugzilla: 51493

--------------------------------

[ Upstream commit d82c6c1a ]

if pl->mac_ops->mac_finish() failed, phylink_err should use
"mac_finish" instead of "mac_prepare".

Fixes: b7ad14c2 ("net: phylink: re-implement interface configuration with PCS")
Signed-off-by: default avatarOng Boon Leong <boon.leong.ong@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarChen Jun <chenjun102@huawei.com>
Acked-by: default avatar&nbsp; Weilong Chen <chenweilong@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent e1858dcd

drivers/net/phy/phylink.c

+1 −1
Original line number Diff line number Diff line
@@ -472,7 +472,7 @@ static void phylink_major_config(struct phylink *pl, bool restart, 
		err = pl->mac_ops->mac_finish(pl->config, pl->cur_link_an_mode,

					      state->interface);

		if (err < 0)

			phylink_err(pl, "mac_prepare failed: %pe\n",

			phylink_err(pl, "mac_finish failed: %pe\n",

				    ERR_PTR(err));

	}

}