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

Timestamp:

2014-07-21T22:10:18Z (10 years ago)

Author:

Agnieszka Tabaka <nufcia@…>

Branches:

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

Children:

1f1fa64

Parents:

96e368a (diff), 54a1ca7 (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:

• Merged mainline changes
• Refactored rtl8169 driver to work with recent driver framework changes
• Fixed speed selection in rtl8169 (disables autonegotiation first)
• Added support for restarting autonegotiation
• Added new switch to 'nic' utility which restarts autonegotiation

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);
 }