git: 6000a417d32a - stable/13 - net: iflib: sync isc_capenable to if_capenable

From: Vincenzo Maffione <vmaffione_at_FreeBSD.org>
Date: Thu, 06 Jan 2022 10:12:50 UTC
The branch stable/13 has been updated by vmaffione:

URL: https://cgit.FreeBSD.org/src/commit/?id=6000a417d32a417911ed3d96d3bb3f59fce5a9ae

commit 6000a417d32a417911ed3d96d3bb3f59fce5a9ae
Author:     Vincenzo Maffione <vmaffione@FreeBSD.org>
AuthorDate: 2021-12-28 10:47:13 +0000
Commit:     Vincenzo Maffione <vmaffione@FreeBSD.org>
CommitDate: 2022-01-06 09:53:08 +0000

    net: iflib: sync isc_capenable to if_capenable
    
    On SIOCSIFCAP, some bits in ifp->if_capenable may be toggled.
    When this happens, apply the same change to isc_capenable, which
    is the iflib private copy of if_capenable (for a subset of the
    IFCAP_* bits). In this way the iflib drivers can check the bits
    using isc_capenable rather than if_capenable. This is convenient
    because the latter access requires an additional indirection
    through the ifp, and it is also less likely to be in cache.
    
    PR:             260068
    Reviewed by:    kbowling, gallatin
    MFC after:      1 week
    Differential Revision:  https://reviews.freebsd.org/D33156
    
    (cherry picked from commit 4561c4f0ca59da5b704238074bd488ff907b4b50)
---
 sys/net/iflib.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys/net/iflib.c b/sys/net/iflib.c
index 85da3e77f037..c852e31c0aac 100644
--- a/sys/net/iflib.c
+++ b/sys/net/iflib.c
@@ -4423,6 +4423,7 @@ iflib_if_ioctl(if_t ifp, u_long command, caddr_t data)
 				iflib_stop(ctx);
 			STATE_LOCK(ctx);
 			if_togglecapenable(ifp, setmask);
+			ctx->ifc_softc_ctx.isc_capenable ^= setmask;
 			STATE_UNLOCK(ctx);
 			if (bits & IFF_DRV_RUNNING && setmask & ~IFCAP_WOL)
 				iflib_init_locked(ctx);