@@ -1448,49 +1448,48 @@ static inline void pci_free_consistent_esx(struct pci_dev *pdev, size_t size,
return;
}
pci_unmap_single(pdev, mapping, size, PCI_DMA_BIDIRECTIONAL);
#if (VMWARE_ESX_DDK_VERSION == 41000)
pfn = virt_to_page(virt);
vmk_MemPoolFree(&pfn);
#else
range.startMPN = virt_to_page(virt);
range.numPages = 1 << get_order(size);
alloc_request.mpnRanges = ⦥
alloc_request.numPages = range.numPages;
alloc_request.numElements = 1;
vmk_MemPoolFree(&alloc_request);
#endif /* (VMWARE_ESX_DDK_VERSION == 41000) */
#if (VMWARE_ESX_DDK_VERSION >= 60000)
static inline void bnx2i_int_to_scsilun_with_sec_lun_id(uint16_t lun,
struct scsi_lun *scsi_lun,
uint64_t sllid)
{
if (sllid != VMKLNX_SCSI_INVALID_SECONDLEVEL_ID) {
VMK_ASSERT(lun <= 255); /* Max LUN supported is 255. */
memset(scsi_lun, 0, 8);
scsi_lun->scsi_lun[0] = (lun >> 8) & 0xFF;
scsi_lun->scsi_lun[1] = lun & 0xFF;
scsi_lun->scsi_lun[2] = (uint8_t)((sllid >> 56) & 0xFF); /* sllid msb */
scsi_lun->scsi_lun[3] = (uint8_t)((sllid >> 48) & 0xFF);
scsi_lun->scsi_lun[4] = (uint8_t)((sllid >> 40) & 0xFF);
scsi_lun->scsi_lun[5] = (uint8_t)((sllid >> 32) & 0xFF);
scsi_lun->scsi_lun[6] = (uint8_t)((sllid >> 24) & 0xFF);
scsi_lun->scsi_lun[7] = (uint8_t)((sllid >> 16) & 0xFF); /* sllid lsb */
} else {
int_to_scsilun(lun, scsi_lun);
#endif /* (VMWARE_ESX_DDK_VERSION >= 60000) */
#endif /* __VMKLNX__ */
extern unsigned int cmd_cmpl_per_work;
extern unsigned int max_bnx2x_sessions;
extern unsigned int max_bnx2_sessions;
#ifdef __VMKLNX__
extern int bnx2i_max_sectors;
#endif