Changeset 8b36bf2 in mainline for uspace/srv/net/tcp/sock.c

Timestamp:

2012-06-20T23:03:29Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

d5070ef

Parents:

8375d0eb (diff), 6eef3c4 (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

File:

• uspace/srv/net/tcp/sock.c (modified) (1 diff)

uspace/srv/net/tcp/sock.c

@@ -151 +151 @@
             sock, sock_id);
 
-        if (rc != EOK)
+        if (rc != EOK) {
+                fibril_destroy(sock->recv_fibril);
+                sock->recv_fibril = 0;
                 return rc;
+        }
 
         sock_core = socket_cores_find(&sock->client->sockets, *sock_id);