diff options
| author |   reyk <reyk@openbsd.org> | 2005-10-09 18:45:27 +0000 |
|---|---|---|
| committer | reyk <reyk@openbsd.org> | 2005-10-09 18:45:27 +0000 |
| commit | 972184b43f1da3a46430d22c59939245b6cb03d0 (patch) | |
| tree | 02bed0dabc8075d1606de6bb506341896aefc609 | |
| parent | simplify if() conditions; (diff) | |
| download | wireguard-openbsd-972184b43f1da3a46430d22c59939245b6cb03d0.tar.xz wireguard-openbsd-972184b43f1da3a46430d22c59939245b6cb03d0.zip | |
use label
| -rw-r--r-- | sys/net/if_trunk.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sys/net/if_trunk.c b/sys/net/if_trunk.c index 41b1ab96c4f..79b9b6c568c 100644 --- a/sys/net/if_trunk.c +++ b/sys/net/if_trunk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_trunk.c,v 1.8 2005/10/03 01:46:47 reyk Exp $ */ +/* $OpenBSD: if_trunk.c,v 1.9 2005/10/09 18:45:27 reyk Exp $ */ /* * Copyright (c) 2005 Reyk Floeter <reyk@vantronix.net> @@ -554,10 +554,8 @@ trunk_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) s = splimp(); - if ((error = ether_ioctl(ifp, &tr->tr_ac, cmd, data)) > 0) { - splx(s); - return (error); - } + if ((error = ether_ioctl(ifp, &tr->tr_ac, cmd, data)) > 0) + goto out; bzero(&rpbuf, sizeof(rpbuf)); @@ -709,7 +707,6 @@ trunk_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) out: splx(s); - return (error); } |