diff options
| author |   miod <miod@openbsd.org> | 2015-03-23 20:18:52 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2015-03-23 20:18:52 +0000 |
| commit | 6c57018b88403158767b371ff1c1b0d750b708f5 (patch) | |
| tree | 4562521775ab6b44521f7e1f1660b62ef9d3a040 | |
| parent | be clear about MPLS spelling it out explicitly the first time (diff) | |
| download | wireguard-openbsd-6c57018b88403158767b371ff1c1b0d750b708f5.tar.xz wireguard-openbsd-6c57018b88403158767b371ff1c1b0d750b708f5.zip | |
Fix buglet in previous ofdev change causing NFS boot to fail; found the hard
way by mpi@. Bump version.
ok mpi@
| -rw-r--r-- | sys/arch/macppc/stand/conf.c | 4 | ||||
| -rw-r--r-- | sys/arch/macppc/stand/ofdev.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/macppc/stand/conf.c b/sys/arch/macppc/stand/conf.c index 8549e952941..c81efcfdfc2 100644 --- a/sys/arch/macppc/stand/conf.c +++ b/sys/arch/macppc/stand/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.6 2015/03/14 20:52:41 miod Exp $ */ +/* $OpenBSD: conf.c,v 1.7 2015/03/23 20:18:52 miod Exp $ */ /* * Copyright (c) 2007 Dale Rahn <drahn@openbsd.org> * @@ -21,7 +21,7 @@ #include <lib/libsa/stand.h> -const char version[] = "1.4"; +const char version[] = "1.5"; int debug = 0; void ofc_probe(struct consdev *); diff --git a/sys/arch/macppc/stand/ofdev.c b/sys/arch/macppc/stand/ofdev.c index 1c0487568a8..567006a0b0b 100644 --- a/sys/arch/macppc/stand/ofdev.c +++ b/sys/arch/macppc/stand/ofdev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ofdev.c,v 1.21 2015/03/14 20:52:41 miod Exp $ */ +/* $OpenBSD: ofdev.c,v 1.22 2015/03/23 20:18:52 miod Exp $ */ /* $NetBSD: ofdev.c,v 1.1 1997/04/16 20:29:20 thorpej Exp $ */ /* @@ -368,7 +368,7 @@ devopen(struct open_file *of, const char *name, char **file) if (!strcmp(buf, "network")) { ofdev->type = OFDEV_NET; of->f_dev = devsw; - of->f_devdata = &ofdev; + of->f_devdata = ofdev; bcopy(&file_system_nfs, file_system, sizeof file_system[0]); nfsys = 1; if (error = net_open(ofdev)) |