mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-24 11:29:10 +00:00
Correct some problems with workitem usage. NdisScheduleWorkItem() does
not use exactly the same workitem sturcture as ExQueueWorkItem() like I originally thought it did.
This commit is contained in:
parent
4a73995979
commit
d9ccba1ac4
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=146273
@ -977,9 +977,23 @@ typedef enum ndis_interrupt_mode ndis_interrupt_mode;
|
||||
|
||||
#define NUMBER_OF_SINGLE_WORK_ITEMS 6
|
||||
|
||||
typedef work_queue_item ndis_work_item;
|
||||
typedef work_item_func ndis_proc;
|
||||
#define NdisInitializeWorkItem(w, f, c) ExInitializeWorkItem(w, f, c)
|
||||
struct ndis_work_item;
|
||||
|
||||
typedef void (*ndis_proc)(struct ndis_work_item *, void *);
|
||||
|
||||
struct ndis_work_item {
|
||||
void *nwi_ctx;
|
||||
ndis_proc nwi_func;
|
||||
uint8_t nwi_wraprsvd[sizeof(void *) * 8];
|
||||
};
|
||||
|
||||
typedef struct ndis_work_item ndis_work_item;
|
||||
|
||||
#define NdisInitializeWorkItem(w, f, c) \
|
||||
do { \
|
||||
(w)->nwi_ctx = c; \
|
||||
(w)->nwi_func = f; \
|
||||
} while (0)
|
||||
|
||||
#ifdef notdef
|
||||
struct ndis_buffer {
|
||||
|
@ -1658,6 +1658,7 @@ NdisMAllocateSharedMemoryAsync(adapter, len, cached, ctx)
|
||||
w->na_cached = cached;
|
||||
w->na_len = len;
|
||||
w->na_ctx = ctx;
|
||||
w->na_iw = iw;
|
||||
|
||||
ifw = (io_workitem_func)ndis_findwrap((funcptr)ndis_asyncmem_complete);
|
||||
IoQueueWorkItem(iw, ifw, WORKQUEUE_DELAYED, w);
|
||||
@ -3100,13 +3101,29 @@ NdisMIndicateStatus(adapter, status, sbuf, slen)
|
||||
* depends on the API semantics of ExQueueWorkItem(). In our world,
|
||||
* ExQueueWorkItem() is implemented on top of IoAllocateQueueItem()
|
||||
* anyway.
|
||||
*
|
||||
* There are actually three distinct APIs here. NdisScheduleWorkItem()
|
||||
* takes a pointer to an NDIS_WORK_ITEM. ExQueueWorkItem() takes a pointer
|
||||
* to a WORK_QUEUE_ITEM. And finally, IoQueueWorkItem() takes a pointer
|
||||
* to an opaque work item thingie which you get from IoAllocateWorkItem().
|
||||
* An NDIS_WORK_ITEM is not the same as a WORK_QUEUE_ITEM. However,
|
||||
* the NDIS_WORK_ITEM has some opaque storage at the end of it, and we
|
||||
* (ab)use this storage as a WORK_QUEUE_ITEM, which is what we submit
|
||||
* to ExQueueWorkItem().
|
||||
*
|
||||
* Got all that? (Sheesh.)
|
||||
*/
|
||||
|
||||
ndis_status
|
||||
NdisScheduleWorkItem(work)
|
||||
ndis_work_item *work;
|
||||
{
|
||||
ExQueueWorkItem(work, WORKQUEUE_DELAYED);
|
||||
work_queue_item *wqi;
|
||||
|
||||
wqi = (work_queue_item *)work->nwi_wraprsvd;
|
||||
ExInitializeWorkItem(wqi,
|
||||
(work_item_func)work->nwi_func, work->nwi_ctx);
|
||||
ExQueueWorkItem(wqi, WORKQUEUE_DELAYED);
|
||||
return(NDIS_STATUS_SUCCESS);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user