Author: mav
Date: Mon Mar  4 22:01:09 2019
New Revision: 344782
URL: https://svnweb.freebsd.org/changeset/base/344782

Log:
  bridge: Fix spurious warnings about capabilities
  
  Mask off the bits we don't care about when checking that capabilities
  of the member interfaces have been disabled as intended.
  
  Submitted by: Ryan Moeller <r...@ixsystems.com>
  Reviewed by:  kristof, mav
  MFC after:    1 week
  Sponsored by: iXsystems, Inc.
  Differential Revision:        https://reviews.freebsd.org/D18924

Modified:
  head/sys/net/if_bridge.c

Modified: head/sys/net/if_bridge.c
==============================================================================
--- head/sys/net/if_bridge.c    Mon Mar  4 21:10:40 2019        (r344781)
+++ head/sys/net/if_bridge.c    Mon Mar  4 22:01:09 2019        (r344782)
@@ -925,7 +925,7 @@ bridge_set_ifcap(struct bridge_softc *sc, struct bridg
 {
        struct ifnet *ifp = bif->bif_ifp;
        struct ifreq ifr;
-       int error;
+       int error, mask, stuck;
 
        BRIDGE_UNLOCK_ASSERT(sc);
 
@@ -938,10 +938,12 @@ bridge_set_ifcap(struct bridge_softc *sc, struct bridg
                        if_printf(sc->sc_ifp,
                            "error setting capabilities on %s: %d\n",
                            ifp->if_xname, error);
-               if ((ifp->if_capenable & ~set) != 0)
+               mask = BRIDGE_IFCAPS_MASK | BRIDGE_IFCAPS_STRIP;
+               stuck = ifp->if_capenable & mask & ~set;
+               if (stuck != 0)
                        if_printf(sc->sc_ifp,
                            "can't disable some capabilities on %s: 0x%x\n",
-                           ifp->if_xname, ifp->if_capenable & ~set);
+                           ifp->if_xname, stuck);
        }
 }
 
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to