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

Timestamp:

2014-09-12T03:45:25Z (12 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/dnsrsrv/transport.c (modified) (2 diffs)

uspace/srv/net/dnsrsrv/transport.c

@@ -286 +286 @@
 static int transport_recv_fibril(void *arg)
 {
-        dns_message_t *resp;
+        dns_message_t *resp = NULL;
         trans_req_t *treq;
         int rc;
@@ -294 +294 @@
                 if (rc != EOK)
                         continue;
+
+                assert(resp != NULL);
 
                 fibril_mutex_lock(&treq_lock);