summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2002-04-10 18:52:28 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2002-04-10 18:52:28 +0000
commit6d12dca7ea8c77ca97a8a0488412c9ff8fd4f27a (patch)
tree98a15c8ba8c340d20fb4efd791ece2b22db799f3 /sbin
parenteafbf8b6e8df9541a700b02bb28d018e7ab2c851 (diff)
Add missing IFM_OPTIONS macro. Previously 'ifconfig -mediaopt' could
clear bits other than media options. Fix from NetBSD.
Diffstat (limited to 'sbin')
-rw-r--r--sbin/ifconfig/ifconfig.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index dfd6748c8d1..e6af6ee4c91 100644
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ifconfig.c,v 1.60 2002/02/23 22:07:20 millert Exp $ */
+/* $OpenBSD: ifconfig.c,v 1.61 2002/04/10 18:52:27 millert Exp $ */
/* $NetBSD: ifconfig.c,v 1.40 1997/10/01 02:19:43 enami Exp $ */
/*
@@ -81,7 +81,7 @@ static const char copyright[] =
#if 0
static const char sccsid[] = "@(#)ifconfig.c 8.2 (Berkeley) 2/16/94";
#else
-static const char rcsid[] = "$OpenBSD: ifconfig.c,v 1.60 2002/02/23 22:07:20 millert Exp $";
+static const char rcsid[] = "$OpenBSD: ifconfig.c,v 1.61 2002/04/10 18:52:27 millert Exp $";
#endif
#endif /* not lint */
@@ -1515,7 +1515,7 @@ get_media_options(type, val)
if (option == -1)
errx(1, "unknown %s media option: %s",
get_media_type_string(type), str);
- rval |= option;
+ rval |= IFM_OPTIONS(option);
}
free(optlist);