diff options
| author | Steve French <sfrench@us.ibm.com> | 2009-09-01 19:20:50 +0200 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-09-01 19:20:50 +0200 |
| commit | ca43e3beee38623a3f80691b28623d6ecf214742 (patch) | |
| tree | 779d99d0f4a29d3fc6541f48423da9852eb6bbbe /fs/cifs/connect.c | |
| parent | PATCH] cifs: fix broken mounts when a SSH tunnel is used (try #4) (diff) | |
| download | linux-ca43e3beee38623a3f80691b28623d6ecf214742.tar.xz linux-ca43e3beee38623a3f80691b28623d6ecf214742.zip | |
[CIFS] Fix checkpatch warnings
Also update version number to 1.61
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/connect.c')
| -rw-r--r-- | fs/cifs/connect.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 4e47a9b800ce..d49682433c20 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -1415,17 +1415,17 @@ cifs_find_tcp_session(struct sockaddr_storage *addr, unsigned short int port) case AF_INET6: if (ipv6_addr_equal(&addr6->sin6_addr, &server->addr.sockAddr6.sin6_addr) && - (addr6->sin6_scope_id == + (addr6->sin6_scope_id == server->addr.sockAddr6.sin6_scope_id)) { addr6->sin6_port = htons(port); /* user overrode default port? */ if (addr6->sin6_port) { - if (addr6->sin6_port != + if (addr6->sin6_port != server->addr.sockAddr6.sin6_port) - continue; + continue; } break; - } else + } else continue; } @@ -2657,9 +2657,9 @@ CIFSTCon(unsigned int xid, struct cifsSesInfo *ses, return -EIO; smb_buffer = cifs_buf_get(); - if (smb_buffer == NULL) { + if (smb_buffer == NULL) return -ENOMEM; - } + smb_buffer_response = smb_buffer; header_assemble(smb_buffer, SMB_COM_TREE_CONNECT_ANDX, |