2.6.25-rc7

 net

 sctp

diff --git a/net/sctp/auth.c b/net/sctp/auth.c
index 97e6ebd..675a5c3 100644
--- a/net/sctp/auth.c
+++ b/net/sctp/auth.c
@@ -1,15 +1,15 @@
-/* SCTP kernel reference Implementation
+/* SCTP kernel implementation
  * (C) Copyright 2007 Hewlett-Packard Development Company, L.P.
  *
- * This file is part of the SCTP kernel reference Implementation
+ * This file is part of the SCTP kernel implementation
  *
- * The SCTP reference implementation is free software;
+ * This SCTP implementation is free software;
  * you can redistribute it and/or modify it under the terms of
  * the GNU General Public License as published by
  * the Free Software Foundation; either version 2, or (at your option)
  * any later version.
  *
- * The SCTP reference implementation is distributed in the hope that it
+ * This SCTP implementation is distributed in the hope that it
  * will be useful, but WITHOUT ANY WARRANTY; without even the implied
  *                 ************************
  * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -420,15 +420,15 @@ struct sctp_shared_key *sctp_auth_get_shkey(
             const struct sctp_association *asoc,
             __u16 key_id)
 {
-   struct sctp_shared_key *key = NULL;
+   struct sctp_shared_key *key;
 
    /* First search associations set of endpoint pair shared keys */
    key_for_each(key, &asoc->endpoint_shared_keys) {
       if (key->key_id == key_id)
-         break;
+         return key;
    }
 
-   return key;
+   return NULL;
 }
 
 /*
@@ -838,11 +838,11 @@ int sctp_auth_set_key(struct sctp_endpoint *ep,
    }
 
    /* Create a new key data based on the info passed in */
-   key = sctp_auth_create_key(auth_key->sca_keylen, GFP_KERNEL);
+   key = sctp_auth_create_key(auth_key->sca_keylength, GFP_KERNEL);
    if (!key)
       goto nomem;
 
-   memcpy(key->data, &auth_key->sca_key[0], auth_key->sca_keylen);
+   memcpy(key->data, &auth_key->sca_key[0], auth_key->sca_keylength);
 
    /* If we are replacing, remove the old keys data from the
     * key id.  If we are adding new key id, add it to the