Changeset 8e7c9fe in mainline for uspace/srv/net/inetsrv/inet_link.c

Timestamp:

2014-09-12T03:45:25Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• uspace/srv/net/inetsrv/inet_link.c (modified) (3 diffs)

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;
 }
 
@@ -465 +481 @@
         list_foreach(inet_links, link_list, inet_link_t, ilink) {
                 id_list[i++] = ilink->svc_id;
-                log_msg(LOG_DEFAULT, LVL_NOTE, "add link to list");
         }
 
         fibril_mutex_unlock(&inet_links_lock);
 
-        log_msg(LOG_DEFAULT, LVL_NOTE, "return %zu links", count);
         *rid_list = id_list;
         *rcount = count;