diff options
| author |   dlg <dlg@openbsd.org> | 2019-01-30 01:09:36 +0000 |
|---|---|---|
| committer | dlg <dlg@openbsd.org> | 2019-01-30 01:09:36 +0000 |
| commit | a8b0ba141f05c6cb0fbf16844abbc7b92167e1c3 (patch) | |
| tree | 1c4f4ecbd81692647758416ff446feb17d27515d /sys/net/if_mpe.c | |
| parent | add some macros to help turn labels into shims and back again. (diff) | |
| download | wireguard-openbsd-a8b0ba141f05c6cb0fbf16844abbc7b92167e1c3.tar.xz wireguard-openbsd-a8b0ba141f05c6cb0fbf16844abbc7b92167e1c3.zip | |
use MPLS_SHIM2LABEL and MPLS_LABEL2SHIM
Diffstat (limited to 'sys/net/if_mpe.c')
| -rw-r--r-- | sys/net/if_mpe.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/net/if_mpe.c b/sys/net/if_mpe.c index f165ba05115..bfdf4df3bb4 100644 --- a/sys/net/if_mpe.c +++ b/sys/net/if_mpe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_mpe.c,v 1.75 2019/01/30 00:28:26 dlg Exp $ */ +/* $OpenBSD: if_mpe.c,v 1.76 2019/01/30 01:09:36 dlg Exp $ */ /* * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@spootnik.org> @@ -304,9 +304,7 @@ mpe_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) break; case SIOCGETLABEL: ifm = ifp->if_softc; - shim.shim_label = - ((ntohl(ifm->sc_smpls.smpls_label & MPLS_LABEL_MASK)) >> - MPLS_LABEL_OFFSET); + shim.shim_label = MPLS_SHIM2LABEL(ifm->sc_smpls.smpls_label); error = copyout(&shim, ifr->ifr_data, sizeof(shim)); break; case SIOCSETLABEL: @@ -318,7 +316,7 @@ mpe_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) error = EINVAL; break; } - shim.shim_label = htonl(shim.shim_label << MPLS_LABEL_OFFSET); + shim.shim_label = MPLS_LABEL2SHIM(shim.shim_label); if (ifm->sc_smpls.smpls_label == shim.shim_label) break; LIST_FOREACH(ifm, &mpeif_list, sc_list) { |