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/ospfd/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/ospfd/interface.c')
| -rw-r--r-- | usr.sbin/ospfd/interface.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/ospfd/interface.c b/usr.sbin/ospfd/interface.c index 8c0849ebc2a..1c8fca2f388 100644 --- a/usr.sbin/ospfd/interface.c +++ b/usr.sbin/ospfd/interface.c @@ -1,4 +1,4 @@ -/* $OpenBSD: interface.c,v 1.78 2015/07/20 23:45:39 benno Exp $ */ +/* $OpenBSD: interface.c,v 1.79 2015/09/27 17:31:50 stsp Exp $ */ /* * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org> @@ -198,7 +198,7 @@ if_new(struct kif *kif, struct kif_addr *ka) iface->ifindex = kif->ifindex; iface->flags = kif->flags; iface->linkstate = kif->link_state; - iface->media_type = kif->media_type; + iface->if_type = kif->if_type; iface->baudrate = kif->baudrate; /* set address, mask and p2p addr */ @@ -340,11 +340,11 @@ if_act_start(struct iface *iface) if (!(iface->flags & IFF_UP) || (!LINK_STATE_IS_UP(iface->linkstate) && - !(iface->media_type == IFT_CARP && + !(iface->if_type == IFT_CARP && iface->linkstate == LINK_STATE_DOWN))) return (0); - if (iface->media_type == IFT_CARP && iface->passive == 0) { + if (iface->if_type == IFT_CARP && iface->passive == 0) { /* force passive mode on carp interfaces */ log_warnx("if_act_start: forcing interface %s to passive", iface->name); @@ -639,7 +639,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->passive; ictl.auth_type = iface->auth_type; |