Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 19:03:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Call the MiniportShutdown handler at the right time

Browse source 
- Now we call it upon system shutdown and if a bug check occurred

svn path=/branches/aicom-network-fixes/; revision=36667
This commit is contained in:
Cameron Gutman 2008-10-06 18:56:44 +00:00
parent 31b506837b
commit b3443bcbb9
1 changed files with 35 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

40
drivers/network/ndis/ndis/miniport.c
View file

@ -1137,8 +1137,10 @@ NdisMDeregisterAdapterShutdownHandler(
NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n"));
if(Adapter->BugcheckContext->ShutdownHandler) if(Adapter->BugcheckContext->ShutdownHandler) {
KeDeregisterBugCheckCallback(Adapter->BugcheckContext->CallbackRecord); KeDeregisterBugCheckCallback(Adapter->BugcheckContext->CallbackRecord);
IoUnregisterShutdownNotification(Adapter->NdisMiniportBlock.DeviceObject);
}
} }
@ -1306,13 +1308,10 @@ NdisMRegisterAdapterShutdownHandler(
*/ */
{ {
PLOGICAL_ADAPTER Adapter = (PLOGICAL_ADAPTER)MiniportHandle; PLOGICAL_ADAPTER Adapter = (PLOGICAL_ADAPTER)MiniportHandle;
PMINIPORT_BUGCHECK_CONTEXT BugcheckContext = Adapter->BugcheckContext; PMINIPORT_BUGCHECK_CONTEXT BugcheckContext;
NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n"));
if(BugcheckContext)
return;
BugcheckContext = ExAllocatePool(NonPagedPool, sizeof(MINIPORT_BUGCHECK_CONTEXT)); BugcheckContext = ExAllocatePool(NonPagedPool, sizeof(MINIPORT_BUGCHECK_CONTEXT));
if(!BugcheckContext) if(!BugcheckContext)
{ {
@ -1324,11 +1323,19 @@ NdisMRegisterAdapterShutdownHandler(
BugcheckContext->DriverContext = ShutdownContext; BugcheckContext->DriverContext = ShutdownContext;
BugcheckContext->CallbackRecord = ExAllocatePool(NonPagedPool, sizeof(KBUGCHECK_CALLBACK_RECORD)); BugcheckContext->CallbackRecord = ExAllocatePool(NonPagedPool, sizeof(KBUGCHECK_CALLBACK_RECORD));
if (!BugcheckContext->CallbackRecord) {
ExFreePool(BugcheckContext);
return;
}
Adapter->BugcheckContext = BugcheckContext;
KeInitializeCallbackRecord(BugcheckContext->CallbackRecord); KeInitializeCallbackRecord(BugcheckContext->CallbackRecord);
KeRegisterBugCheckCallback(BugcheckContext->CallbackRecord, NdisIBugcheckCallback, KeRegisterBugCheckCallback(BugcheckContext->CallbackRecord, NdisIBugcheckCallback,
BugcheckContext, sizeof(BugcheckContext), (PUCHAR)"Ndis Miniport"); BugcheckContext, sizeof(BugcheckContext), (PUCHAR)"Ndis Miniport");
IoRegisterShutdownNotification(Adapter->NdisMiniportBlock.DeviceObject);
} }
@ -1781,6 +1788,28 @@ NdisIPnPStopDevice(
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
NTSTATUS
NTAPI
NdisIShutdown(
IN PDEVICE_OBJECT DeviceObject,
PIRP Irp)
{
PLOGICAL_ADAPTER Adapter = DeviceObject->DeviceExtension;
PMINIPORT_BUGCHECK_CONTEXT Context = Adapter->BugcheckContext;
ADAPTER_SHUTDOWN_HANDLER ShutdownHandler = Context->ShutdownHandler;
ASSERT(ShutdownHandler);
ShutdownHandler(Context->DriverContext);
Irp->IoStatus.Status = STATUS_SUCCESS;
Irp->IoStatus.Information = 0;
IoCompleteRequest(Irp, IO_NO_INCREMENT);
return STATUS_SUCCESS;
}
NTSTATUS NTSTATUS
NTAPI NTAPI
@ -2075,6 +2104,7 @@ NdisMRegisterMiniport(
*MiniportPtr = Miniport; *MiniportPtr = Miniport;
Miniport->DriverObject->MajorFunction[IRP_MJ_PNP] = NdisIDispatchPnp; Miniport->DriverObject->MajorFunction[IRP_MJ_PNP] = NdisIDispatchPnp;
Miniport->DriverObject->MajorFunction[IRP_MJ_SHUTDOWN] = NdisIShutdown;
Miniport->DriverObject->DriverExtension->AddDevice = NdisIAddDevice; Miniport->DriverObject->DriverExtension->AddDevice = NdisIAddDevice;
return NDIS_STATUS_SUCCESS; return NDIS_STATUS_SUCCESS;