rpms/kernel/F-11 linux-2.6-fs-cifs-fix-port-numbers.patch, 1.2, 1.3 kernel.spec, 1.1687, 1.1688

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24023

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-fs-cifs-fix-port-numbers.patch 
Log Message:
linux-2.6-fs-cifs-fix-port-numbers.patch

linux-2.6-fs-cifs-fix-port-numbers.patch:
 connect.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: linux-2.6-fs-cifs-fix-port-numbers.patch
===================================================================
RCS file: linux-2.6-fs-cifs-fix-port-numbers.patch
diff -N linux-2.6-fs-cifs-fix-port-numbers.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-fs-cifs-fix-port-numbers.patch	10 Aug 2009 19:07:34 -0000	1.3
@@ -0,0 +1,33 @@
+From: Simo Leone <simo at archlinux.org>
+Date: Thu, 25 Jun 2009 02:44:43 +0000 (+0000)
+Subject: [CIFS] Copy struct *after* setting the port, instead of before.
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=6debdbc0ba6253ac519cd5a3d22e30f1f9f1dd12
+
+[CIFS] Copy struct *after* setting the port, instead of before.
+
+Acked-by: Jeff Layton <jlayton at redhat.com>
+Signed-off-by: Simo Leone <simo at archlinux.org>
+Signed-off-by: Steve French <sfrench at us.ibm.com>
+---
+
+diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
+index a581cfa..12c2cf6 100644
+--- a/fs/cifs/connect.c
++++ b/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) {


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1687
retrieving revision 1.1688
diff -u -p -r1.1687 -r1.1688
--- kernel.spec	10 Aug 2009 19:04:31 -0000	1.1687
+++ kernel.spec	10 Aug 2009 19:07:34 -0000	1.1688
@@ -668,7 +668,7 @@ Patch2901: linux-2.6-v4l-dvb-experimenta
 Patch2903: linux-2.6-revert-dvb-net-kabi-change.patch
 
 # fs fixes
-Patch3000: linux-2.6-btrfs-experimental-branch.patch
+Patch3000: linux-2.6-fs-cifs-fix-port-numbers.patch
 
 #snmp fixes
 Patch10000: linux-2.6-missing-rfc2465-stats.patch
@@ -1151,6 +1151,12 @@ ApplyPatch linux-2.6-execshield.patch
 
 # ecryptfs
 
+# nfs
+
+# cifs
+# fix cifs mount option "port=" (#506574)
+ApplyPatch linux-2.6-fs-cifs-fix-port-numbers.patch
+
 # USB
 
 # ACPI
@@ -1837,6 +1843,7 @@ fi
 * Mon Aug 10 2009 Kyle McMartin <kyle at redhat.com>
 - Patch sync-up with F-11-2.6.29.y:
  - linux-2.6-x86-delay-tsc-barrier.patch
+ - linux-2.6-fs-cifs-fix-port-numbers.patch
 
 * Wed Aug 05 2009 Kyle McMartin <kyle at redhat.com>
 - Update to released 2.6.30.4.