Stop adapter on Rx cancel. Ensure working S3 sleep/wake

rxqueue.cpp

@@ -507,6 +507,12 @@ EvtRxQueueCancel(
 
     RT_RXQUEUE* rx = RtGetRxQueueContext(rxQueue);
 
+    WdfSpinLockAcquire(rx->Adapter->Lock);
+
+    re_stop(&rx->Adapter->bsdData);
+
+    WdfSpinLockRelease(rx->Adapter->Lock);
+
     // try (but not very hard) to grab anything that may have been
     // indicated during rx disable. advance will continue to be called
     // after cancel until all packets are returned to the framework.

txqueue.cpp

@@ -641,18 +641,5 @@ EvtTxQueueCancel(
     // the queue will continue to be drained like normal.
     //
 
-    NET_RING* pr = NetRingCollectionGetPacketRing(tx->Rings);
-
-    while (pr->BeginIndex != pr->EndIndex)
-    {
-        NET_PACKET* packet = NetRingGetPacketAtIndex(pr, pr->BeginIndex);
-        packet->Ignore = 1;
-
-        pr->BeginIndex = NetRingIncrementIndex(pr, pr->BeginIndex);
-    }
-
-    NET_RING* fr = NetRingCollectionGetFragmentRing(tx->Rings);
-    fr->BeginIndex = fr->EndIndex;
-
     TraceExit();
 }