xnu-792.6.56.tar.gz

[apple/xnu.git] / bsd / netat / adsp_Close.c

diff --git a/bsd/netat/adsp_Close.c b/bsd/netat/adsp_Close.c
index d7e276e7017d9b3102fda240941211b738be6f98..6a17945940f8b50878b670d870952a8ed3f1e5c0 100644 (file)
--- a/bsd/netat/adsp_Close.c
+++ b/bsd/netat/adsp_Close.c
@@ -3,19 +3,20 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -173,7 +174,7 @@ void RemoveCCB(sp, pb)              /* (CCBPtr sp, DSPPBPtr pb) */
     /*
      * Unlink CCB from list
      */
-    qRemove(AT_ADSP_STREAMS, sp); /* remove sp from active streams queue */
+    qRemove((CCB *)AT_ADSP_STREAMS, sp); /* remove sp from active streams queue */
 
     if (pb) {
        pb->ioResult = 0;
@@ -222,7 +223,7 @@ int  AbortIO(sp, err)
     /*
      * Complete all outstanding transactions.  
      */
-    total += CompleteQueue(&sp->sapb, err); /* Abort outstanding send attentions */
+    total = CompleteQueue(&sp->sapb, err); /* Abort outstanding send attentions */
     CompleteQueue(&sp->frpb, err); /* Abort outstanding forward resets */
 
     if (sp->sbuf_mb) { /* clear the send queue */