Changeset 89ac5513 in mainline for uspace/srv/net/loopip/loopip.c

Timestamp:

2013-06-23T19:54:53Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ddb1922

Parents:

3abf0760 (diff), 96cbd18 (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/loopip/loopip.c (modified) (2 diffs)

uspace/srv/net/loopip/loopip.c

@@ -50 +50 @@
 static int loopip_send(iplink_srv_t *srv, iplink_srv_sdu_t *sdu);
 static int loopip_get_mtu(iplink_srv_t *srv, size_t *mtu);
-static int loopip_addr_add(iplink_srv_t *srv, iplink_srv_addr_t *addr);
-static int loopip_addr_remove(iplink_srv_t *srv, iplink_srv_addr_t *addr);
+static int loopip_addr_add(iplink_srv_t *srv, uint32_t addr);
+static int loopip_addr_remove(iplink_srv_t *srv, uint32_t addr);
 
 static void loopip_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg);
@@ -189 +189 @@
 }
 
-static int loopip_addr_add(iplink_srv_t *srv, iplink_srv_addr_t *addr)
-{
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip_addr_add(0x%" PRIx32 ")", addr->ipv4);
-        return EOK;
-}
-
-static int loopip_addr_remove(iplink_srv_t *srv, iplink_srv_addr_t *addr)
-{
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip_addr_remove(0x%" PRIx32 ")", addr->ipv4);
+static int loopip_addr_add(iplink_srv_t *srv, uint32_t addr)
+{
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip_addr_add(0x%" PRIx32 ")", addr);
+        return EOK;
+}
+
+static int loopip_addr_remove(iplink_srv_t *srv, uint32_t addr)
+{
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip_addr_remove(0x%" PRIx32 ")", addr);
         return EOK;
 }