> Date: Thu, 12 Mar 2020 12:21:53 +0100
> From: Martin Pieuchot <m...@openbsd.org>
>
> Those two statements are redundant, so keep only one of them, ok?
ok kettenis@
> Index: kern/subr_disk.c
> ===================================================================
> RCS file: /cvs/src/sys/kern/subr_disk.c,v
> retrieving revision 1.235
> diff -u -p -r1.235 subr_disk.c
> --- kern/subr_disk.c 26 Dec 2019 22:38:00 -0000 1.235
> +++ kern/subr_disk.c 12 Mar 2020 11:15:13 -0000
> @@ -1610,9 +1610,7 @@ gotswap:
> panic("root device (%s) not found", buf);
> }
>
> - if (rootdv && rootdv == bootdv && rootdv->dv_class == DV_IFNET)
> - ifp = ifunit(rootdv->dv_xname);
> - else if (bootdv && bootdv->dv_class == DV_IFNET)
> + if (bootdv != NULL && bootdv->dv_class == DV_IFNET)
> ifp = ifunit(bootdv->dv_xname);
>
> if (ifp)
>
>
