diff options
| author | David S. Miller <davem@davemloft.net> | 2008-02-28 13:56:37 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-28 13:56:37 -0800 |
| commit | 64758bd7927be1f755e7a08edb2253d37e4b2445 (patch) | |
| tree | 91bd6ac12e9f537568ede4b6113dea5ed60fe9f8 /net/sctp/auth.c | |
| parent | 16e297b35811c53288b35e15a5823fd8534c6d21 (diff) | |
| parent | 7e8616d8e7731b026019d9af7cc9914b8bb42bc7 (diff) | |
Merge branch 'pending' of master.kernel.org:/pub/scm/linux/kernel/git/vxy/lksctp-dev
Diffstat (limited to 'net/sctp/auth.c')
| -rw-r--r-- | net/sctp/auth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sctp/auth.c b/net/sctp/auth.c index 8bb79f281774..675a5c3e68a6 100644 --- a/net/sctp/auth.c +++ b/net/sctp/auth.c @@ -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 |