Changeset 8e7c9fe in mainline for uspace/srv/net/dhcp/transport.c

Timestamp:

2014-09-12T03:45:25Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• uspace/srv/net/dhcp/transport.c (modified) (2 diffs)

uspace/srv/net/dhcp/transport.c

@@ -172 +172 @@
         dhcp_transport_t *dt = (dhcp_transport_t *)arg;
         void *msg;
-        size_t size;
+        size_t size = (size_t) -1;
         int rc;
 
@@ -179 +179 @@
                 if (rc != EOK)
                         break;
+
+                assert(size != (size_t) -1);
 
                 dt->recv_cb(dt->cb_arg, msg, size);