Changeset 0773396 in mainline for uspace/srv/net/tcp/conn.c

Timestamp:

2013-12-25T13:05:25Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bc54126c

Parents:

f4a47e52 (diff), 6946f23 (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/conn.c (modified) (2 diffs)

uspace/srv/net/tcp/conn.c

@@ -360 +360 @@
         fibril_mutex_lock(&conn_list_lock);
         
-        list_foreach(conn_list, link) {
-                tcp_conn_t *conn = list_get_instance(link, tcp_conn_t, link);
+        list_foreach(conn_list, link, tcp_conn_t, conn) {
                 tcp_sockpair_t *csp = &conn->ident;
                 
@@ -382 +381 @@
  * @param conn  Connection
  */
-static void tcp_conn_reset(tcp_conn_t *conn)
+void tcp_conn_reset(tcp_conn_t *conn)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_conn_reset()", conn->name);