Changeset c62a8275 in mainline for uspace/srv

Timestamp:

2014-09-01T11:17:23Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a4666a9

Parents:

f93ba6d5 (diff), 320bd52 (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 from lp:~nufcia/helenos/rtl8169.

Location:

uspace/srv/net

Files:

• ethip/ethip.c (modified) (3 diffs)
• ethip/ethip_nic.c (modified) (2 diffs)
• inetsrv/inet_link.c (modified) (2 diffs)

uspace/srv/net/ethip/ethip.c

@@ -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
@@ -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)
 {

uspace/srv/net/ethip/ethip_nic.c

@@ -245 +245 @@
             addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
 
+        memcpy(&nic->mac_addr, addr, sizeof(nic->mac_addr));
+
+        rc = iplink_ev_change_addr(&nic->iplink, &nic->mac_addr);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "iplink_ev_change_addr() failed");
+                return;
+        }
+
         free(addr);
         async_answer_0(callid, EOK);
@@ -309 +317 @@
                         break;
                 default:
-                        log_msg(LOG_DEFAULT, LVL_DEBUG, "unknown IPC method: %d", (int) IPC_GET_IMETHOD(call));
+                        log_msg(LOG_DEFAULT, LVL_DEBUG, "unknown IPC method: %" PRIun, IPC_GET_IMETHOD(call));
                         async_answer_0(callid, ENOTSUP);
                 }

uspace/srv/net/inetsrv/inet_link.c

@@ -55 +55 @@
 
 static int inet_iplink_recv(iplink_t *, iplink_recv_sdu_t *, ip_ver_t);
+static int inet_iplink_change_addr(iplink_t *, addr48_t);
 static inet_link_t *inet_link_get_by_id_locked(sysarg_t);
 
 static iplink_ev_ops_t inet_iplink_ev_ops = {
-        .recv = inet_iplink_recv
+        .recv = inet_iplink_recv,
+        .change_addr = inet_iplink_change_addr,
 };
 
@@ -110 +112 @@
         
         return rc;
+}
+
+static int inet_iplink_change_addr(iplink_t *iplink, addr48_t mac)
+{
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_iplink_change_addr(): "
+            "new addr=%02x:%02x:%02x:%02x:%02x:%02x",
+            mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
+
+        list_foreach(inet_links, link_list, inet_link_t, ilink) {
+                if (ilink->sess == iplink->sess)
+                        memcpy(&ilink->mac, mac, sizeof(addr48_t));
+        }
+
+        return EOK;
 }