X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/8ad349bb6ed4a0be06e34c92be0d98b92e078db4..5d5c5d0d5b79ade9a973d55186ffda2638ba2b6e:/bsd/netat/ddp_lap.c

diff --git a/bsd/netat/ddp_lap.c b/bsd/netat/ddp_lap.c
index 93067e191..d0e4fb77c 100644
--- a/bsd/netat/ddp_lap.c
+++ b/bsd/netat/ddp_lap.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2006 Apple Computer, Inc. All Rights Reserved.
- * 
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
  * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
  * 
  * This file contains Original Code and/or Modifications of Original Code 
@@ -123,8 +123,6 @@ int xpatcnt = 0;
 /* externs */
 extern TAILQ_HEAD(name_registry, _nve_) name_registry;
 extern snmpStats_t	snmpStats;
-extern atlock_t ddpinp_lock;
-extern atlock_t arpinp_lock;
 extern short appletalk_inited;
 extern int adspInited;
 extern struct atpcb ddp_head;
@@ -863,7 +861,7 @@ elap_dataput(m, elapp, addr_flag, addr)
 	     * it doesn't know net#, consequently can't do 
 	     * AMT_LOOKUP.  That task left to aarp now.
 	     */
-	    error = aarp_send_data(m,elapp,&dest_at_addr, loop);
+	    error = aarp_send_data(m, elapp, &dest_at_addr, loop);
 	    break;
 	case ET_ADDR :
 	    error = pat_output(elapp, m, &dest_addr, 0);
@@ -1034,7 +1032,6 @@ void elap_offline(elapp)
 {
 	void	zip_sched_getnetinfo(); /* forward reference */
 	int	errno;
-	int s;
 
 	dPrintf(D_M_ELAP, D_L_SHUTDN_INFO, ("elap_offline:%s\n", elapp->ifName));
 	if (elapp->ifState != LAP_OFFLINE) {
@@ -1048,11 +1045,9 @@ void elap_offline(elapp)
 		(void)at_unreg_mcast(elapp, (caddr_t)&elapp->cable_multicast_addr);
 		elapp->ifState = LAP_OFFLINE;
 
-		ATDISABLE(s, ddpinp_lock);
 		if (MULTIPORT_MODE)
 			RT_DELETE(elapp->ifThisCableEnd,
 				  elapp->ifThisCableStart);
-		ATENABLE(s, ddpinp_lock);
 
 		/* make sure no zip timeouts are left running */
 		elapp->ifGNIScheduled = 0;
@@ -1105,7 +1100,7 @@ int ddp_shutdown(count_only)
 	CCB *sp, *sp_next;
 	gref_t *gref;
 	vm_offset_t temp_rcb_data, temp_state_data;
-	int i, s, active_skts = 0;	/* count of active pids for non-socketized
+	int i, active_skts = 0;	/* count of active pids for non-socketized
 				   AppleTalk protocols */
 
 	/* Network is shutting down... send error messages up on each open
@@ -1114,8 +1109,6 @@ int ddp_shutdown(count_only)
 	     sockets, but return EBUSY and don't complete shutdown. *** 
 	 */
 
-	s = splimp();	/* *** previously contained mismatched locking 
-			   that was ifdef'ed to splimp() *** */
 	if (!count_only)
 		nbp_shutdown();	/* clear all known NVE */
 
@@ -1201,11 +1194,9 @@ int ddp_shutdown(count_only)
 		atalk_notify(gref, ESHUTDOWN);
 	    }
 	}
-	if (count_only) {
-		splx(s);
+	if (count_only)
 		return(active_skts);
 
-	}
 	/* if there are no interfaces in the process of going online, continue shutting down DDP */
 	for (i = 0; i < IF_TOTAL_MAX; i++) {
 		if (at_interfaces[i].startup_inprogress == TRUE)
@@ -1257,7 +1248,6 @@ int ddp_shutdown(count_only)
 	}
 	ddp_start();
 	
-	splx(s);
 	return(0);
 } /* ddp_shutdown */
 
@@ -1318,11 +1308,9 @@ void ZIPwakeup(elapp, ZipError)
      at_ifaddr_t *elapp;
      int ZipError;
 {
-	int s, error = ZipError;
+	int error = ZipError;
 
-	ATDISABLE(s, ddpinp_lock);
 	if ( (elapp != NULL) && elapp->startup_inprogress) {
-		ATENABLE(s, ddpinp_lock);
 
 		/* was ZIPContinue */
 		/* was elapp_online() with jump to ZIP_sleep */
@@ -1357,21 +1345,17 @@ void ZIPwakeup(elapp, ZipError)
 			dPrintf(D_M_ELAP, D_L_STARTUP_INFO,
 				("elap_online: ifZipError=%d\n", error));
 		}
-	} else
-		ATENABLE(s, ddpinp_lock);
+	}
 } /* ZIPwakeup */
 
 void AARPwakeup(probe_cb)
      aarp_amt_t *probe_cb;
 {
-	int s;
 	int errno;
 	at_ifaddr_t *elapp;
 
-	ATDISABLE(s, arpinp_lock);
 	elapp = probe_cb->elapp;
 	if ( (elapp != NULL) && elapp->startup_inprogress && elapp->aa_ifp != 0) {
-		ATENABLE(s, arpinp_lock);
 
 		/* was AARPContinue */
 		errno = aarp_init2(elapp);
@@ -1393,8 +1377,7 @@ void AARPwakeup(probe_cb)
 				("elap_online: aarp_init returns zero\n"));
 			elap_online2(elapp);
 		}
-	} else
-		ATENABLE(s, arpinp_lock);
+	}
 } /* AARPwakeup */
 
 void ddp_bit_reverse(addr)