Changeset 3317724 in mainline for uspace/srv/net/tl/tcp/tcp.c

Timestamp:

2011-03-29T19:32:53Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

eea1dd5

Parents:

2cf95e8 (diff), 93ebe4e (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/tl/tcp/tcp.c (modified) (2 diffs)

uspace/srv/net/tl/tcp/tcp.c

@@ -1707 +1707 @@
                 if (socket->port > 0) {
                         socket_ports_exclude(&tcp_globals.sockets,
-                            socket->port);
+                            socket->port, free);
                         socket->port = 0;
                 }
@@ -2492 +2492 @@
         rc = packet_dimensions_initialize(&tcp_globals.dimensions);
         if (rc != EOK) {
-                socket_ports_destroy(&tcp_globals.sockets);
+                socket_ports_destroy(&tcp_globals.sockets, free);
                 goto out;
         }