Changeset 8e7c9fe in mainline for uspace/srv/net/udp/assoc.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/udp/assoc.c (modified) (2 diffs)

uspace/srv/net/udp/assoc.c

@@ -275 +275 @@
 
         rc = udp_transmit_pdu(pdu);
+        udp_pdu_delete(pdu);
+
         if (rc != EOK)
                 return EIO;
-
-        udp_pdu_delete(pdu);
 
         return EOK;
@@ -335 +335 @@
                 /* XXX Generate ICMP error. */
                 /* XXX Might propagate error directly by error return. */
+                udp_msg_delete(msg);
                 return;
         }