svn commit: r226728 - head/sys/geom/eli
Pawel Jakub Dawidek
pjd at FreeBSD.org
Tue Oct 25 13:09:23 UTC 2011
Author: pjd
Date: Tue Oct 25 13:09:22 2011
New Revision: 226728
URL: http://svn.freebsd.org/changeset/base/226728
Log:
Prefer G_ELI_VERSION_* defines for version numbers over plain digits.
MFC after: 3 days
Modified:
head/sys/geom/eli/g_eli.c
Modified: head/sys/geom/eli/g_eli.c
==============================================================================
--- head/sys/geom/eli/g_eli.c Tue Oct 25 13:08:03 2011 (r226727)
+++ head/sys/geom/eli/g_eli.c Tue Oct 25 13:09:22 2011 (r226728)
@@ -717,12 +717,14 @@ g_eli_create(struct gctl_req *req, struc
sc->sc_crypto = G_ELI_CRYPTO_UNKNOWN;
sc->sc_flags = md->md_flags;
/* Backward compatibility. */
- if (md->md_version < 4)
+ if (md->md_version < G_ELI_VERSION_04)
sc->sc_flags |= G_ELI_FLAG_NATIVE_BYTE_ORDER;
- if (md->md_version < 5)
+ if (md->md_version < G_ELI_VERSION_05)
sc->sc_flags |= G_ELI_FLAG_SINGLE_KEY;
- if (md->md_version < 6 && (sc->sc_flags & G_ELI_FLAG_AUTH) != 0)
+ if (md->md_version < G_ELI_VERSION_06 &&
+ (sc->sc_flags & G_ELI_FLAG_AUTH) != 0) {
sc->sc_flags |= G_ELI_FLAG_FIRST_KEY;
+ }
sc->sc_ealgo = md->md_ealgo;
sc->sc_nkey = nkey;
More information about the svn-src-head
mailing list