diff options
| author |   dlg <dlg@openbsd.org> | 2019-04-19 07:39:37 +0000 |
|---|---|---|
| committer | dlg <dlg@openbsd.org> | 2019-04-19 07:39:37 +0000 |
| commit | b9e5cef3e33b510a78a24f49dc93bd20a0629044 (patch) | |
| tree | ee382161b1e5022587fb4335e0440f1cd5e77cdc /sys/net/if_bpe.c | |
| parent | provide factored out txhprio and rxhprio checks (diff) | |
| download | wireguard-openbsd-b9e5cef3e33b510a78a24f49dc93bd20a0629044.tar.xz wireguard-openbsd-b9e5cef3e33b510a78a24f49dc93bd20a0629044.zip | |
use the factored out txhprio and rxhprio checks
reduces code duplication and chance for error.
Diffstat (limited to 'sys/net/if_bpe.c')
| -rw-r--r-- | sys/net/if_bpe.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/sys/net/if_bpe.c b/sys/net/if_bpe.c index 7b34a02dd13..c307a4caf76 100644 --- a/sys/net/if_bpe.c +++ b/sys/net/if_bpe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bpe.c,v 1.3 2019/04/19 06:40:00 dlg Exp $ */ +/* $OpenBSD: if_bpe.c,v 1.4 2019/04/19 07:39:37 dlg Exp $ */ /* * Copyright (c) 2018 David Gwynne <dlg@openbsd.org> * @@ -482,13 +482,9 @@ bpe_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) break; case SIOCSTXHPRIO: - if (ifr->ifr_hdrprio == IF_HDRPRIO_PACKET) /* use mbuf prio */ - ; - else if (ifr->ifr_hdrprio < IF_HDRPRIO_MIN || - ifr->ifr_hdrprio > IF_HDRPRIO_MAX) { - error = EINVAL; + error = if_txhprio_l2_check(ifr->ifr_hdrprio); + if (error != 0) break; - } sc->sc_txhprio = ifr->ifr_hdrprio; break; @@ -497,14 +493,9 @@ bpe_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) break; case SIOCSRXHPRIO: - if (ifr->ifr_hdrprio == IF_HDRPRIO_OUTER || - ifr->ifr_hdrprio == IF_HDRPRIO_PACKET) /* use mbuf prio */ - ; - else if (ifr->ifr_hdrprio < IF_HDRPRIO_MIN || - ifr->ifr_hdrprio > IF_HDRPRIO_MAX) { - error = EINVAL; + error = if_rxhprio_l2_check(ifr->ifr_hdrprio); + if (error != 0) break; - } sc->sc_rxhprio = ifr->ifr_hdrprio; break; |