svn commit: r317586 - head/sys/net

[Alexander Motin]

Author: mav
Date: Sat Apr 29 08:52:07 2017
New Revision: 317586
URL: https://svnweb.freebsd.org/changeset/base/317586

Log:
  Make if_bridge complain if it can't disable some capabilities.
  
  MFC after:	2 weeks
  Sponsored by:	iXsystems, Inc.

Modified:
  head/sys/net/if_bridge.c

Modified: head/sys/net/if_bridge.c
==============================================================================
--- head/sys/net/if_bridge.c	Sat Apr 29 08:28:59 2017	(r317585)
+++ head/sys/net/if_bridge.c	Sat Apr 29 08:52:07 2017	(r317586)
@@ -940,8 +940,12 @@ bridge_set_ifcap(struct bridge_softc *sc
 		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);
 	}
 }