34c34
< __FBSDID("$FreeBSD: head/sys/compat/ndis/kern_windrv.c 142399 2005-02-24 21:49:14Z wpaul $");
---
> __FBSDID("$FreeBSD: head/sys/compat/ndis/kern_windrv.c 142931 2005-03-01 17:21:25Z wpaul $");
237c237
< struct driver_object *dobj;
---
> struct driver_object *drv;
280,281c280,281
< dobj = malloc(sizeof(device_object), M_DEVBUF, M_NOWAIT|M_ZERO);
< if (dobj == NULL) {
---
> drv = malloc(sizeof(driver_object), M_DEVBUF, M_NOWAIT|M_ZERO);
> if (drv == NULL) {
288c288
< dobj->dro_driverext = malloc(sizeof(driver_extension),
---
> drv->dro_driverext = malloc(sizeof(driver_extension),
291c291
< if (dobj->dro_driverext == NULL) {
---
> if (drv->dro_driverext == NULL) {
293c293
< free(dobj, M_DEVBUF);
---
> free(drv, M_DEVBUF);
297c297
< INIT_LIST_HEAD((&dobj->dro_driverext->dre_usrext));
---
> INIT_LIST_HEAD((&drv->dro_driverext->dre_usrext));
299,300c299,300
< dobj->dro_driverstart = (void *)img;
< dobj->dro_driversize = len;
---
> drv->dro_driverstart = (void *)img;
> drv->dro_driversize = len;
302,304c302,304
< dobj->dro_drivername.us_len = strlen(DUMMY_REGISTRY_PATH) * 2;
< dobj->dro_drivername.us_maxlen = strlen(DUMMY_REGISTRY_PATH) * 2;
< dobj->dro_drivername.us_buf = NULL;
---
> drv->dro_drivername.us_len = strlen(DUMMY_REGISTRY_PATH) * 2;
> drv->dro_drivername.us_maxlen = strlen(DUMMY_REGISTRY_PATH) * 2;
> drv->dro_drivername.us_buf = NULL;
306c306
< &dobj->dro_drivername.us_buf);
---
> &drv->dro_drivername.us_buf);
308c308
< new->windrv_object = dobj;
---
> new->windrv_object = drv;
312c312
< status = MSCALL2(entry, dobj, &dobj->dro_drivername);
---
> status = MSCALL2(entry, drv, &drv->dro_drivername);
315,316c315,316
< free(dobj->dro_drivername.us_buf, M_DEVBUF);
< free(dobj, M_DEVBUF);
---
> free(drv->dro_drivername.us_buf, M_DEVBUF);
> free(drv, M_DEVBUF);