diff options
| author | Stefan Sperling <stsp@cvs.openbsd.org> | 2015-09-27 17:31:51 +0000 |
|---|---|---|
| committer | Stefan Sperling <stsp@cvs.openbsd.org> | 2015-09-27 17:31:51 +0000 |
| commit | 39b65a840256d6b9d1a90c073296b9481f69c68d (patch) | |
| tree | 46295f2bb6ab36216b606508394a894cde852d30 /usr.sbin/ospfd/ospfd.c | |
| parent | 8198c6fa8a809aebd16cd6936c44c32095b3c6c2 (diff) | |
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/ospfd.c')
| -rw-r--r-- | usr.sbin/ospfd/ospfd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/ospfd/ospfd.c b/usr.sbin/ospfd/ospfd.c index 7fdf9327826..d821f0a9b35 100644 --- a/usr.sbin/ospfd/ospfd.c +++ b/usr.sbin/ospfd/ospfd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ospfd.c,v 1.85 2015/07/20 23:45:39 benno Exp $ */ +/* $OpenBSD: ospfd.c,v 1.86 2015/09/27 17:31:50 stsp Exp $ */ /* * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org> @@ -862,7 +862,7 @@ merge_interfaces(struct area *a, struct area *xa) i->self->priority = i->priority; i->flags = xi->flags; /* needed? */ i->type = xi->type; /* needed? */ - i->media_type = xi->media_type; /* needed? */ + i->if_type = xi->if_type; /* needed? */ i->linkstate = xi->linkstate; /* needed? */ i->auth_type = xi->auth_type; |