2c2
< * Copyright (c) 2005-2007 Daniel Braniss <danny@cs.huji.ac.il>
---
> * Copyright (c) 2005-2008 Daniel Braniss <danny@cs.huji.ac.il>
29c29
< __FBSDID("$FreeBSD: head/sys/dev/iscsi/initiator/isc_cam.c 183397 2008-09-27 08:51:18Z ed $");
---
> __FBSDID("$FreeBSD: head/sys/dev/iscsi/initiator/isc_cam.c 185289 2008-11-25 07:17:11Z scottl $");
195a196,212
> static __inline int
> _scsi_encap(struct cam_sim *sim, union ccb *ccb)
> {
> int ret;
>
> #if __FreeBSD_version < 700000
> ret = scsi_encap(sim, ccb);
> #else
> struct isc_softc *isp = (struct isc_softc *)cam_sim_softc(sim);
>
> mtx_unlock(&isp->cam_mtx);
> ret = scsi_encap(sim, ccb);
> mtx_lock(&isp->cam_mtx);
> #endif
> return ret;
> }
>
284,285c301
< #if __FreeBSD_version < 700000
< if(scsi_encap(sim, ccb) != 0)
---
> if(_scsi_encap(sim, ccb) != 0)
287,294d302
< #else
< mtx_unlock(&isp->cam_mtx);
< if(scsi_encap(sim, ccb) != 0) {
< mtx_lock(&isp->cam_mtx);
< return;
< }
< mtx_lock(&isp->cam_mtx);
< #endif
399c407,411
< if(xpt_bus_register(sim, NULL, 0/*bus_number*/) != CAM_SUCCESS)
---
> if(xpt_bus_register(sim,
> #if __FreeBSD_version >= 700000
> NULL,
> #endif
> 0/*bus_number*/) != CAM_SUCCESS)