Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

[linux-2.6-omap-h63xx.git] / net / sunrpc / auth_gss / gss_spkm3_mech.c

diff --git a/net/sunrpc/auth_gss/gss_spkm3_mech.c b/net/sunrpc/auth_gss/gss_spkm3_mech.c
index 7e15aa68ae64c57800d4fef33f20bc1a9a80b33a..5deb4b6e451404acc126eef5b9e2e855cef1fcb0 100644 (file)
--- a/net/sunrpc/auth_gss/gss_spkm3_mech.c
+++ b/net/sunrpc/auth_gss/gss_spkm3_mech.c
@@ -202,7 +202,7 @@ gss_get_mic_spkm3(struct gss_ctx    *ctx,
        return err;
 }
 
-static struct gss_api_ops gss_spkm3_ops = {
+static const struct gss_api_ops gss_spkm3_ops = {
        .gss_import_sec_context = gss_import_sec_context_spkm3,
        .gss_get_mic            = gss_get_mic_spkm3,
        .gss_verify_mic         = gss_verify_mic_spkm3,
@@ -217,6 +217,7 @@ static struct pf_desc gss_spkm3_pfs[] = {
 static struct gss_api_mech gss_spkm3_mech = {
        .gm_name        = "spkm3",
        .gm_owner       = THIS_MODULE,
+       .gm_oid         = {7, "\053\006\001\005\005\001\003"},
        .gm_ops         = &gss_spkm3_ops,
        .gm_pf_num      = ARRAY_SIZE(gss_spkm3_pfs),
        .gm_pfs         = gss_spkm3_pfs,