diff options
| author | Jeff Layton <jlayton@redhat.com> | 2010-07-06 20:43:01 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2010-08-02 12:40:34 +0000 |
| commit | 50d971602a6c4bf1abe1f3873686f431d7539dfe (patch) | |
| tree | 6c7b58ab4f26cfd4f98a271b4369fd43f9caae7a /fs/cifs/cifsproto.h | |
| parent | 488f1d2d6cc9d665c9f09e4b54f77052732e3058 (diff) | |
| download | kernel_samsung_smdk4412-50d971602a6c4bf1abe1f3873686f431d7539dfe.zip kernel_samsung_smdk4412-50d971602a6c4bf1abe1f3873686f431d7539dfe.tar.gz kernel_samsung_smdk4412-50d971602a6c4bf1abe1f3873686f431d7539dfe.tar.bz2 | |
cifs: set the port in sockaddr in a more clearly defined fashion
This patch should replace the patch I sent a couple of weeks ago to
set the port in cifs_convert_address.
Currently we set this in cifs_find_tcp_session, but that's more of a
side effect than anything. Add a new function called cifs_fill_sockaddr.
Have it call cifs_convert_address and then set the port.
This also allows us to skip passing in the port as a separate parm to
cifs_find_tcp_session.
Also, change cifs_convert_address take a struct sockaddr * rather than
void * to make it clearer how this function should be called.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/cifsproto.h')
| -rw-r--r-- | fs/cifs/cifsproto.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h index fb6318b..2eaebbd 100644 --- a/fs/cifs/cifsproto.h +++ b/fs/cifs/cifsproto.h @@ -86,7 +86,9 @@ extern unsigned int smbCalcSize(struct smb_hdr *ptr); extern unsigned int smbCalcSize_LE(struct smb_hdr *ptr); extern int decode_negTokenInit(unsigned char *security_blob, int length, struct TCP_Server_Info *server); -extern int cifs_convert_address(char *src, void *dst); +extern int cifs_convert_address(struct sockaddr *dst, char *src); +extern int cifs_fill_sockaddr(struct sockaddr *dst, char *src, + unsigned short int port); extern int map_smb_to_linux_error(struct smb_hdr *smb, int logErr); extern void header_assemble(struct smb_hdr *, char /* command */ , const struct cifsTconInfo *, int /* length of |