Changeset 231b3fd in mainline for uspace/srv/net/ethip/atrans.c


Ignore:
Timestamp:
2018-08-25T21:35:26Z (6 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:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/net/ethip/atrans.c

    re2625b1a r231b3fd  
    134134}
    135135
    136 errno_t atrans_lookup_timeout(addr32_t ip_addr, suseconds_t timeout,
     136errno_t atrans_lookup_timeout(addr32_t ip_addr, usec_t timeout,
    137137    addr48_t mac_addr)
    138138{
Note: See TracChangeset for help on using the changeset viewer.