Date: Fri, 22 Jan 2021 12:48:47 GMT From: Hans Petter Selasky <hselasky@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 2695791408f5 - stable/11 - MFC r367612: mlx5en: Set ifmr_current same as ifmr_active. Message-ID: <202101221248.10MCmlMU020074@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/11 has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=2695791408f5da6df47cdc83307f9bd2af3b6750 commit 2695791408f5da6df47cdc83307f9bd2af3b6750 Author: Konstantin Belousov <kib@FreeBSD.org> AuthorDate: 2020-11-19 09:17:41 +0000 Commit: Hans Petter Selasky <hselasky@FreeBSD.org> CommitDate: 2021-01-22 12:47:16 +0000 MFC r367612: mlx5en: Set ifmr_current same as ifmr_active. --- sys/dev/mlx5/mlx5_en/mlx5_en_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c index 81d18152ece2..4ab456c4efc9 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c @@ -484,7 +484,7 @@ mlx5e_media_status(struct ifnet *dev, struct ifmediareq *ifmr) struct mlx5e_priv *priv = dev->if_softc; ifmr->ifm_status = priv->media_status_last; - ifmr->ifm_active = priv->media_active_last | + ifmr->ifm_current = ifmr->ifm_active = priv->media_active_last | (priv->params.rx_pauseframe_control ? IFM_ETH_RXPAUSE : 0) | (priv->params.tx_pauseframe_control ? IFM_ETH_TXPAUSE : 0);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101221248.10MCmlMU020074>