From ebe4288151ce4cbe3f16706d2b23f9d03ec601d3 Mon Sep 17 00:00:00 2001 From: Alexander Motin Date: Sat, 29 Apr 2017 08:52:07 +0000 Subject: [PATCH] Make if_bridge complain if it can't disable some capabilities. MFC after: 2 weeks Sponsored by: iXsystems, Inc. --- sys/net/if_bridge.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index d04b6029983..e67e287bd86 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -940,8 +940,12 @@ bridge_set_ifcap(struct bridge_softc *sc, struct bridge_iflist *bif, int set) 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); } }