Changeset 25459

Timestamp:

05/11/08 15:07:11 (6 days ago)

Author:

mmlr

Message:

* Reset the connection state and speed when the underlaying device is removed.
* Notify the stack of this by releasing the link state change sem (if present).
* Also check for a removed device in the notify callback to prevent accessing
  a device that is going down.

Removing the device under Haiku with an active link will now report the loss of
connection. Still left to implement is to reuse a still existing device if the
same device (based on its MAC) is replugged.

Files:

• haiku/trunk/src/add-ons/kernel/drivers/network/usb_ecm/ECMDevice.cpp (modified) (2 diffs)
• haiku/trunk/src/add-ons/kernel/drivers/network/usb_ecm/ECMDevice.h (modified) (1 diff)

haiku/trunk/src/add-ons/kernel/drivers/network/usb_ecm/ECMDevice.cpp

@@ -373 +373 @@
-
-
+void
+ECMDevice::Removed()
+{
+        fRemoved = true;
+        fHasConnection = false;
+        fDownstreamSpeed = fUpstreamSpeed = 0;
+
+        if (fLinkStateChangeSem >= B_OK)
+                release_sem_etc(fLinkStateChangeSem, 1, B_DO_NOT_RESCHEDULE);
+}
+
+
-status_t
-ECMDevice::_ReadMACAddress()
@@ -433 +445 @@
-        uint32 actualLength)
-{
-        if (status == B_CANCELED)
-                return;
-
-        ECMDevice *device = (ECMDevice *)cookie;
+        if (status == B_CANCELED || device->fRemoved)
+                return;
+
-        if (status == B_OK && actualLength >= sizeof(cdc_notification)) {
-                bool linkStateChange = false;

haiku/trunk/src/add-ons/kernel/drivers/network/usb_ecm/ECMDevice.h

@@ -26 +26 @@
-                status_t                        Control(uint32 op, void *buffer, size_t length);
-
- { fRemoved = true; }
+
-                bool                            IsRemoved() { return fRemoved; };
-