Changeset db71e2a in mainline for uspace/srv/net/ethip/ethip_nic.h

Timestamp:

2013-07-24T17:42:25Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

69b264a9

Parents:

52f1882 (diff), cffa14e6 (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.

usb hc macro changes from mainline were reverted, too many conflicts

File:

• uspace/srv/net/ethip/ethip_nic.h (modified) (2 diffs)

uspace/srv/net/ethip/ethip_nic.h

@@ -39 +39 @@
 
 #include <ipc/loc.h>
+#include <inet/addr.h>
 #include "ethip.h"
 
@@ -44 +45 @@
 extern ethip_nic_t *ethip_nic_find_by_iplink_sid(service_id_t);
 extern int ethip_nic_send(ethip_nic_t *, void *, size_t);
-extern int ethip_nic_addr_add(ethip_nic_t *, iplink_srv_addr_t *);
-extern int ethip_nic_addr_remove(ethip_nic_t *, iplink_srv_addr_t *);
-extern ethip_link_addr_t *ethip_nic_addr_find(ethip_nic_t *,
-    iplink_srv_addr_t *);
+extern int ethip_nic_addr_add(ethip_nic_t *, inet_addr_t *);
+extern int ethip_nic_addr_remove(ethip_nic_t *, inet_addr_t *);
+extern ethip_link_addr_t *ethip_nic_addr_find(ethip_nic_t *, inet_addr_t *);
 
 #endif