diff options
| author |   stsp <stsp@openbsd.org> | 2015-09-27 17:31:50 +0000 |
|---|---|---|
| committer | stsp <stsp@openbsd.org> | 2015-09-27 17:31:50 +0000 |
| commit | 18ffdd9451bdbfe12cfc5ad3ca892e204f4b4047 (patch) | |
| tree | 9315b67d57330fdf752cf0432a8f4fdc76c2a975 /usr.sbin/ospf6d/interface.c | |
| parent | As done for bgpd recently, rename if_mediatype to if_type in ldpd. (diff) | |
| download | wireguard-openbsd-18ffdd9451bdbfe12cfc5ad3ca892e204f4b4047.tar.xz wireguard-openbsd-18ffdd9451bdbfe12cfc5ad3ca892e204f4b4047.zip | |
As done for bgpd recently, rename if_mediatype to if_type in ospfd/ospf6d.
And some ifmedia64 fixes.
"move forward" deraadt@
Diffstat (limited to 'usr.sbin/ospf6d/interface.c')
| -rw-r--r-- | usr.sbin/ospf6d/interface.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/ospf6d/interface.c b/usr.sbin/ospf6d/interface.c index 7d2158b491e..c22bf01d105 100644 --- a/usr.sbin/ospf6d/interface.c +++ b/usr.sbin/ospf6d/interface.c @@ -1,4 +1,4 @@ -/* $OpenBSD: interface.c,v 1.21 2013/11/01 17:18:29 deraadt Exp $ */ +/* $OpenBSD: interface.c,v 1.22 2015/09/27 17:31:50 stsp Exp $ */ /* * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org> @@ -239,7 +239,7 @@ if_update(struct iface *iface, int mtu, int flags, u_int8_t type, { iface->mtu = mtu; iface->flags = flags; - iface->media_type = type; + iface->if_type = type; iface->linkstate = state; iface->baudrate = rate; @@ -376,7 +376,7 @@ if_act_start(struct iface *iface) return (0); } - if (iface->media_type == IFT_CARP && + if (iface->if_type == IFT_CARP && !(iface->cflags & F_IFACE_PASSIVE)) { /* force passive mode on carp interfaces */ log_warnx("if_act_start: forcing interface %s to passive", @@ -678,7 +678,7 @@ if_to_ctl(struct iface *iface) ictl.rxmt_interval = iface->rxmt_interval; ictl.type = iface->type; ictl.linkstate = iface->linkstate; - ictl.mediatype = iface->media_type; + ictl.if_type = iface->if_type; ictl.priority = iface->priority; ictl.passive = (iface->cflags & F_IFACE_PASSIVE) == F_IFACE_PASSIVE; |