From 842ca2d8cbf93ad2b708306367d2a2bbc305edf2 Mon Sep 17 00:00:00 2001 From: Simo Leone Date: Thu, 25 Jun 2009 02:44:43 +0000 Subject: [PATCH] --- yaml --- r: 154373 b: refs/heads/master c: 6debdbc0ba6253ac519cd5a3d22e30f1f9f1dd12 h: refs/heads/master i: 154371: 633176346c7d340660a46e0e250159554d83bbbf v: v3 --- [refs] | 2 +- trunk/fs/cifs/connect.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9edf22b11435..38ff16923c4a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6459340cfcc6f6d165b27c3dd955aeb55a1b73d3 +refs/heads/master: 6debdbc0ba6253ac519cd5a3d22e30f1f9f1dd12 diff --git a/trunk/fs/cifs/connect.c b/trunk/fs/cifs/connect.c index a581cfa2ba82..12c2cf693555 100644 --- a/trunk/fs/cifs/connect.c +++ b/trunk/fs/cifs/connect.c @@ -1496,14 +1496,14 @@ cifs_get_tcp_session(struct smb_vol *volume_info) cFYI(1, ("attempting ipv6 connect")); /* BB should we allow ipv6 on port 139? */ /* other OS never observed in Wild doing 139 with v6 */ + sin_server6->sin6_port = htons(volume_info->port); memcpy(&tcp_ses->addr.sockAddr6, sin_server6, sizeof(struct sockaddr_in6)); - sin_server6->sin6_port = htons(volume_info->port); rc = ipv6_connect(tcp_ses); } else { + sin_server->sin_port = htons(volume_info->port); memcpy(&tcp_ses->addr.sockAddr, sin_server, sizeof(struct sockaddr_in)); - sin_server->sin_port = htons(volume_info->port); rc = ipv4_connect(tcp_ses); } if (rc < 0) {