Changes in uspace/srv/net/ethip/ethip.c [a17356fd:f9b2cb4c] in mainline

File:

• uspace/srv/net/ethip/ethip.c (modified) (8 diffs)

uspace/srv/net/ethip/ethip.c

@@ -44 +44 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <net/socket_codes.h>
+#include <task.h>
 #include "arp.h"
 #include "ethip.h"
@@ -59 +59 @@
 static int ethip_get_mtu(iplink_srv_t *srv, size_t *mtu);
 static int ethip_get_mac48(iplink_srv_t *srv, addr48_t *mac);
+static int ethip_set_mac48(iplink_srv_t *srv, addr48_t *mac);
 static int ethip_addr_add(iplink_srv_t *srv, inet_addr_t *addr);
 static int ethip_addr_remove(iplink_srv_t *srv, inet_addr_t *addr);
@@ -71 +72 @@
         .get_mtu = ethip_get_mtu,
         .get_mac48 = ethip_get_mac48,
+        .set_mac48 = ethip_set_mac48,
         .addr_add = ethip_addr_add,
         .addr_remove = ethip_addr_remove
@@ -77 +79 @@
 static int ethip_init(void)
 {
-        async_set_client_connection(ethip_client_conn);
+        async_set_fallback_port_handler(ethip_client_conn, NULL);
         
         int rc = loc_server_register(NAME);
@@ -145 +147 @@
         service_id_t sid;
 
-        sid = (service_id_t)IPC_GET_ARG1(*icall);
+        sid = (service_id_t) IPC_GET_ARG2(*icall);
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_client_conn(%u)", (unsigned)sid);
         nic = ethip_nic_find_by_iplink_sid(sid);
@@ -249 +251 @@
                 sdu.size = frame.size;
                 log_msg(LOG_DEFAULT, LVL_DEBUG, " - call iplink_ev_recv");
-                rc = iplink_ev_recv(&nic->iplink, &sdu, AF_INET);
+                rc = iplink_ev_recv(&nic->iplink, &sdu, ip_v4);
                 break;
         case ETYPE_IPV6:
@@ -256 +258 @@
                 sdu.size = frame.size;
                 log_msg(LOG_DEFAULT, LVL_DEBUG, " - call iplink_ev_recv");
-                rc = iplink_ev_recv(&nic->iplink, &sdu, AF_INET6);
+                rc = iplink_ev_recv(&nic->iplink, &sdu, ip_v6);
                 break;
         default:
@@ -284 +286 @@
 }
 
+static int ethip_set_mac48(iplink_srv_t *srv, addr48_t *mac)
+{
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_set_mac48()");
+        
+        ethip_nic_t *nic = (ethip_nic_t *) srv->arg;
+        addr48(*mac, nic->mac_addr);
+        
+        return EOK;
+}
+
 static int ethip_addr_add(iplink_srv_t *srv, inet_addr_t *addr)
 {