rpms/kernel/devel kernel-2.6.spec, 1.2152, 1.2153 linux-2.6-compile-fixes.patch, 1.69, 1.70

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6588

Modified Files:
	kernel-2.6.spec linux-2.6-compile-fixes.patch 
Log Message:
cifs build fix



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2152
retrieving revision 1.2153
diff -u -r1.2152 -r1.2153
--- kernel-2.6.spec	24 Apr 2006 01:38:57 -0000	1.2152
+++ kernel-2.6.spec	24 Apr 2006 03:10:57 -0000	1.2153
@@ -1011,7 +1011,7 @@
 #
 # misc small stuff to make things compile or otherwise improve performance
 #
-#%patch10000 -p1
+%patch10000 -p1
 
 # Small 1-2 liners fixing silly bugs that get pushed upstream quickly.
 %patch10001 -p1

linux-2.6-compile-fixes.patch:
 connect.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- linux-2.6-compile-fixes.patch	24 Apr 2006 01:38:57 -0000	1.69
+++ linux-2.6-compile-fixes.patch	24 Apr 2006 03:10:57 -0000	1.70
@@ -0,0 +1,24 @@
+
+fs/cifs/connect.c: In function 'cifs_setup_session':
+fs/cifs/connect.c:3451: error: implicit declaration of function 'CIFS_SessSetup'
+
+Signed-off-by: Dave Jones <davej at redhat.com>
+
+--- linux-2.6.16.noarch/fs/cifs/connect.c~	2006-04-23 23:08:32.000000000 -0400
++++ linux-2.6.16.noarch/fs/cifs/connect.c	2006-04-23 23:09:45.000000000 -0400
+@@ -3447,10 +3447,13 @@ int cifs_setup_session(unsigned int xid,
+ 			pSesInfo->server->secMode,
+ 			pSesInfo->server->capabilities,
+ 			pSesInfo->server->timeZone));
++#ifdef CONFIG_CIFS_EXPERIMENTAL
+ 		if(experimEnabled > 1)
+ 			rc = CIFS_SessSetup(xid, pSesInfo, CIFS_NTLM /* type */,
+-					    &ntlmv2_flag, nls_info);	
+-		else if (extended_security
++					    &ntlmv2_flag, nls_info);
++		else
++#endif
++			if (extended_security
+ 				&& (pSesInfo->capabilities & CAP_EXTENDED_SECURITY)
+ 				&& (pSesInfo->server->secType == NTLMSSP)) {
+ 			cFYI(1, ("New style sesssetup"));