diff options
| author | Steve French <sfrench@us.ibm.com> | 2010-09-08 20:54:49 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2010-09-08 20:54:49 +0000 |
| commit | 7100ae97266e387d25d0c8a5d9934931f0b07dbc (patch) | |
| tree | f4280ef000936b8ddb3fad2494e7ac359a91dd0c | |
| parent | d56557af19867edb8c0e96f8e26399698a08857f (diff) | |
| download | linux-stable-7100ae97266e387d25d0c8a5d9934931f0b07dbc.tar.gz linux-stable-7100ae97266e387d25d0c8a5d9934931f0b07dbc.tar.bz2 linux-stable-7100ae97266e387d25d0c8a5d9934931f0b07dbc.zip | |
Revert "[CIFS] Eliminate unused variable warning"
The change to kernel crypto and fixes to ntlvm2 and ntlmssp
series, introduced a regression. Deferring this patch series
to 2.6.37 after Shirish fixes it.
This reverts commit c89e5198b26a869ce2842bad8519264f3394dee9.
Signed-off-by: Steve French <sfrench@us.ibm.com>
Acked-by: Jeff Layton <jlayton@redhat.com>
CC: Shirish Pargaonkar <shirishp@us.ibm.com>
| -rw-r--r-- | fs/cifs/sess.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c index 795095f4eac6..4788e16a02cc 100644 --- a/fs/cifs/sess.c +++ b/fs/cifs/sess.c @@ -620,6 +620,7 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, struct key *spnego_key = NULL; __le32 phase = NtLmNegotiate; /* NTLMSSP, if needed, is multistage */ bool first_time; + char *ntlmsspblob; if (ses == NULL) return -EINVAL; @@ -867,8 +868,6 @@ ssetup_ntlmssp_authenticate: iov[1].iov_base = &pSMB->req.SecurityBlob[0]; } else if (phase == NtLmAuthenticate) { int blob_len; - char *ntlmsspblob; - ntlmsspblob = kmalloc(5 * sizeof(struct _AUTHENTICATE_MESSAGE), GFP_KERNEL); |