diff -cr dev/aac/aac_cam.c dev_new/aac/aac_cam.c
*** dev/aac/aac_cam.c	Wed Jul 26 07:46:00 2006
--- dev_new/aac/aac_cam.c	Mon Jan 15 16:15:28 2007
***************
*** 571,576 ****
--- 571,577 ----
  		device_printf(sc->aac_dev,"Error %d sending ResetBus command\n",
  		    e);
  		aac_release_sync_fib(sc);
+ 		mtx_unlock(&sc->aac_io_lock);
  		return (CAM_REQ_ABORTED);
  	}
  
diff -cr dev/wi/if_wi.c dev_new/wi/if_wi.c
*** dev/wi/if_wi.c	Tue Aug  1 07:37:22 2006
--- dev_new/wi/if_wi.c	Mon Jan 15 16:29:59 2007
***************
*** 1760,1767 ****
  #endif
  		if (ifma->ifma_addr->sa_family != AF_LINK)
  			continue;
! 		if (n >= 16)
  			goto allmulti;
  		IEEE80211_ADDR_COPY(&mlist.wi_mcast[n],
  		    (LLADDR((struct sockaddr_dl *)ifma->ifma_addr)));
  		n++;
--- 1760,1769 ----
  #endif
  		if (ifma->ifma_addr->sa_family != AF_LINK)
  			continue;
! 		if (n >= 16) {
! 			IF_ADDR_UNLOCK(ifp);
  			goto allmulti;
+ 		}
  		IEEE80211_ADDR_COPY(&mlist.wi_mcast[n],
  		    (LLADDR((struct sockaddr_dl *)ifma->ifma_addr)));
  		n++;