diff options
| author | mav <mav@FreeBSD.org> | 2017-04-29 08:52:07 +0000 |
|---|---|---|
| committer | Luiz Souza <luiz@netgate.com> | 2017-10-27 16:48:33 -0200 |
| commit | aa83e9128e0dd056267a0273b13e319391d64910 (patch) | |
| tree | d68cd363952a79ca37c80590a52c525f94aef2b1 /sys/net/if_bridge.c | |
| parent | 4fc692041a938b394f61eaaac75118abc224de52 (diff) | |
| download | FreeBSD-src-aa83e9128e0dd056267a0273b13e319391d64910.zip FreeBSD-src-aa83e9128e0dd056267a0273b13e319391d64910.tar.gz | |
Make if_bridge complain if it can't disable some capabilities.
MFC after: 2 weeks
Sponsored by: iXsystems, Inc.
(cherry picked from commit 08f5e30a7cf6b3be2f5b82b2780940b8299cd1ea)
Diffstat (limited to 'sys/net/if_bridge.c')
| -rw-r--r-- | sys/net/if_bridge.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index 1b43a28..c892ae6 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -942,8 +942,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); } } |
