diff options
| author | Pavel Shilovsky <piastryyy@gmail.com> | 2010-12-13 19:08:35 +0300 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2011-01-06 19:07:53 +0000 |
| commit | a9f1b85e5ba80519dea6974e3574fa7a30cc5e29 (patch) | |
| tree | 255a962ea1d02110c5b31ebb981ce1f588960688 /fs/cifs/cifsglob.h | |
| parent | df8fbc241aa3c451248b1f19fff3a3f604b107f9 (diff) | |
CIFS: Simplify ipv*_connect functions into one (try #4)
Make connect logic more ip-protocol independent and move RFC1001 stuff into
a separate function. Also replace union addr in TCP_Server_Info structure
with sockaddr_storage.
Signed-off-by: Pavel Shilovsky <piastryyy@gmail.com>
Reviewed-and-Tested-by: Jeff Layton <jlayton@samba.org>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/cifsglob.h')
| -rw-r--r-- | fs/cifs/cifsglob.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h index 7136c0c3e2f9..dfd2d46275ab 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/cifs/cifsglob.h @@ -163,10 +163,7 @@ struct TCP_Server_Info { char server_RFC1001_name[RFC1001_NAME_LEN_WITH_NULL]; char *hostname; /* hostname portion of UNC string */ struct socket *ssocket; - union { - struct sockaddr_in sockAddr; - struct sockaddr_in6 sockAddr6; - } addr; + struct sockaddr_storage dstaddr; struct sockaddr_storage srcaddr; /* locally bind to this IP */ wait_queue_head_t response_q; wait_queue_head_t request_q; /* if more than maxmpx to srvr must block*/ |