diff options
author | Steve French <sfrench@us.ibm.com> | 2009-09-01 13:20:50 -0400 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2009-09-01 13:20:50 -0400 |
commit | ca43e3beee38623a3f80691b28623d6ecf214742 (patch) | |
tree | 779d99d0f4a29d3fc6541f48423da9852eb6bbbe /fs/cifs/connect.c | |
parent | bdb97adcdf0993adbd2eef44b4533620d43792de (diff) |
[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) | |||
1415 | case AF_INET6: | 1415 | case AF_INET6: |
1416 | if (ipv6_addr_equal(&addr6->sin6_addr, | 1416 | if (ipv6_addr_equal(&addr6->sin6_addr, |
1417 | &server->addr.sockAddr6.sin6_addr) && | 1417 | &server->addr.sockAddr6.sin6_addr) && |
1418 | (addr6->sin6_scope_id == | 1418 | (addr6->sin6_scope_id == |
1419 | server->addr.sockAddr6.sin6_scope_id)) { | 1419 | server->addr.sockAddr6.sin6_scope_id)) { |
1420 | addr6->sin6_port = htons(port); | 1420 | addr6->sin6_port = htons(port); |
1421 | /* user overrode default port? */ | 1421 | /* user overrode default port? */ |
1422 | if (addr6->sin6_port) { | 1422 | if (addr6->sin6_port) { |
1423 | if (addr6->sin6_port != | 1423 | if (addr6->sin6_port != |
1424 | server->addr.sockAddr6.sin6_port) | 1424 | server->addr.sockAddr6.sin6_port) |
1425 | continue; | 1425 | continue; |
1426 | } | 1426 | } |
1427 | break; | 1427 | break; |
1428 | } else | 1428 | } else |
1429 | continue; | 1429 | continue; |
1430 | } | 1430 | } |
1431 | 1431 | ||
@@ -2657,9 +2657,9 @@ CIFSTCon(unsigned int xid, struct cifsSesInfo *ses, | |||
2657 | return -EIO; | 2657 | return -EIO; |
2658 | 2658 | ||
2659 | smb_buffer = cifs_buf_get(); | 2659 | smb_buffer = cifs_buf_get(); |
2660 | if (smb_buffer == NULL) { | 2660 | if (smb_buffer == NULL) |
2661 | return -ENOMEM; | 2661 | return -ENOMEM; |
2662 | } | 2662 | |
2663 | smb_buffer_response = smb_buffer; | 2663 | smb_buffer_response = smb_buffer; |
2664 | 2664 | ||
2665 | header_assemble(smb_buffer, SMB_COM_TREE_CONNECT_ANDX, | 2665 | header_assemble(smb_buffer, SMB_COM_TREE_CONNECT_ANDX, |