[SSI] openssi/kernel/net/core scm.c,1.3,1.4

Update of /cvsroot/ssic-linux/openssi/kernel/net/core
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16224/kernel/net/core

Modified Files:
      Tag: OPENSSI-FC
	scm.c 
Log Message:
Bug fixes and enhancements. See ChangeLog.


Index: scm.c
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/net/core/scm.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- scm.c	5 Aug 2005 21:40:19 -0000	1.3
+++ scm.c	27 Oct 2009 03:18:30 -0000	1.4
@@ -34,8 +34,9 @@
 #include <net/compat.h>
 #include <net/scm.h>
 
+#ifdef CONFIG_SSI
 #include <cluster/ssi/scm.h>
-
+#endif
 
 /*
  *	Only allow a user to send credentials, that they could set with 
@@ -107,8 +108,10 @@
 	if (fpl) {
 		scm->fp = NULL;
 
+#ifdef CONFIG_SSI
 		if (ssi_scm_fp_destroy(fpl))
 			return;
+#endif
 
 		for (i=fpl->count-1; i>=0; i--)
 			fput(fpl->fp[i]);
@@ -165,9 +168,11 @@
 		p->fp = NULL;
 	}
 
+#ifdef CONFIG_SSI
 	err = ssi_scm_fp_export(p);
 	if (err < 0)
 		goto error;
+#endif
 
 	return 0;
 	


------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference