Changeset 15d0046 in mainline for uspace/srv/net/ethip/arp.c

Timestamp:

2014-09-12T13:22:33Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (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/ethip/arp.c (modified) (1 diff)

uspace/srv/net/ethip/arp.c

@@ -119 +119 @@
                 return rc;
         
-        (void) atrans_wait_timeout(ARP_REQUEST_TIMEOUT);
-        
-        return atrans_lookup(ip_addr, mac_addr);
+        return atrans_lookup_timeout(ip_addr, ARP_REQUEST_TIMEOUT, mac_addr);
 }