Changeset 231b3fd in mainline for uspace/srv/net/inetsrv/ntrans.c

Timestamp:

2018-08-25T21:35:26Z (7 years ago)

Author:

GitHub <noreply@…>

Parents:

e2625b1a (diff), 3c45353 (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.

git-author:

Jakub Jermář <jakub@…> (2018-08-25 21:35:26)

git-committer:

GitHub <noreply@…> (2018-08-25 21:35:26)

Message:

Merge 3c453534a2b093c8039d8e8059b923c71f3492a3 into e2625b1a1e5a2895b86f0e39c2d70a39e49e042a

File:

• uspace/srv/net/inetsrv/ntrans.c (modified) (1 diff)

uspace/srv/net/inetsrv/ntrans.c

@@ -156 +156 @@
  *
  */
-errno_t ntrans_wait_timeout(suseconds_t timeout)
+errno_t ntrans_wait_timeout(usec_t timeout)
 {
         fibril_mutex_lock(&ntrans_list_lock);