Date: Fri, 28 May 2021 05:29:27 GMT From: Kevin Bowling <kbowling@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: d88c3f9f0f48 - stable/12 - ixgbe: Clean up unneeded set in ixgbe_if_multi_set Message-ID: <202105280529.14S5TR5o075761@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by kbowling (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=d88c3f9f0f484f4f664f5785e9a1286a85a3e267 commit d88c3f9f0f484f4f664f5785e9a1286a85a3e267 Author: Kevin Bowling <kbowling@FreeBSD.org> AuthorDate: 2021-04-19 19:22:22 +0000 Commit: Kevin Bowling <kbowling@FreeBSD.org> CommitDate: 2021-05-28 05:29:17 +0000 ixgbe: Clean up unneeded set in ixgbe_if_multi_set We don't need to set the bits here since the if/else if/else statements fully cover setting these bit pairs. Reported by: markj Reviewed by: markj, erj Approved by: #intel_networking MFC aftter: 1 week Differential Revision: https://reviews.freebsd.org/D29827 (cherry picked from commit deecaa144526a5d001aeb99149e2139601388427) --- sys/dev/ixgbe/if_ix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ixgbe/if_ix.c b/sys/dev/ixgbe/if_ix.c index b987369aefde..63eb1e4caa48 100644 --- a/sys/dev/ixgbe/if_ix.c +++ b/sys/dev/ixgbe/if_ix.c @@ -3273,7 +3273,7 @@ ixgbe_if_multi_set(if_ctx_t ctx) mcnt = if_multi_apply(iflib_get_ifp(ctx), ixgbe_mc_filter_apply, adapter); fctrl = IXGBE_READ_REG(&adapter->hw, IXGBE_FCTRL); - fctrl |= (IXGBE_FCTRL_UPE | IXGBE_FCTRL_MPE); + if (ifp->if_flags & IFF_PROMISC) fctrl |= (IXGBE_FCTRL_UPE | IXGBE_FCTRL_MPE); else if (mcnt >= MAX_NUM_MULTICAST_ADDRESSES ||
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105280529.14S5TR5o075761>