git: 1567ceeb09c4 - stable/13 - ixgbe: Clean up unneeded set in ixgbe_if_multi_set

[Kevin Bowling]

The branch stable/13 has been updated by kbowling (ports committer):

URL: https://cgit.FreeBSD.org/src/commit/?id=1567ceeb09c4ca96201b814f8458a18dc053a206

commit 1567ceeb09c4ca96201b814f8458a18dc053a206
Author:     Kevin Bowling <kbowling at FreeBSD.org>
AuthorDate: 2021-04-19 19:22:22 +0000
Commit:     Kevin Bowling <kbowling at FreeBSD.org>
CommitDate: 2021-05-28 05:27:44 +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 43c9d9c72b9a..49d55d39300a 100644
--- a/sys/dev/ixgbe/if_ix.c
+++ b/sys/dev/ixgbe/if_ix.c
@@ -3367,7 +3367,7 @@ ixgbe_if_multi_set(if_ctx_t ctx)
 	    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 ||