svn commit: r346766 - stable/11/sys/net

Alexander Motin mav at FreeBSD.org
Fri Apr 26 21:19:07 UTC 2019


Author: mav
Date: Fri Apr 26 21:19:06 2019
New Revision: 346766
URL: https://svnweb.freebsd.org/changeset/base/346766

Log:
  MFC r317586: Make if_bridge complain if it can't disable some capabilities.

Modified:
  stable/11/sys/net/if_bridge.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/net/if_bridge.c
==============================================================================
--- stable/11/sys/net/if_bridge.c	Fri Apr 26 20:15:47 2019	(r346765)
+++ stable/11/sys/net/if_bridge.c	Fri Apr 26 21:19:06 2019	(r346766)
@@ -942,8 +942,12 @@ bridge_set_ifcap(struct bridge_softc *sc, struct bridg
 		error = (*ifp->if_ioctl)(ifp, SIOCSIFCAP, (caddr_t)&ifr);
 		if (error)
 			if_printf(sc->sc_ifp,
-			    "error setting interface capabilities on %s\n",
-			    ifp->if_xname);
+			    "error setting capabilities on %s: %d\n",
+			    ifp->if_xname, error);
+		if ((ifp->if_capenable & ~set) != 0)
+			if_printf(sc->sc_ifp,
+			    "can't disable some capabilities on %s: 0x%x\n",
+			    ifp->if_xname, ifp->if_capenable & ~set);
 	}
 }
 


More information about the svn-src-stable-11 mailing list