Changeset 3f03199 in mainline for uspace/srv/net/ethip/ethip_nic.c

Timestamp:

2013-09-15T06:33:53Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9348862

Parents:

dd7078c (diff), 1c0cef0 (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.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

File:

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

uspace/srv/net/ethip/ethip_nic.c

@@ -84 +84 @@
                 already_known = false;
 
-                list_foreach(ethip_nic_list, link) {
-                        ethip_nic_t *nic = list_get_instance(link,
-                            ethip_nic_t, link);
+                list_foreach(ethip_nic_list, link, ethip_nic_t, nic) {
                         if (nic->svc_id == svcs[i]) {
                                 already_known = true;
@@ -201 +199 @@
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Error activating NIC '%s'.",
                     nic->svc_name);
+                goto error;
+        }
+
+        rc = nic_broadcast_set_mode(nic->sess, NIC_BROADCAST_ACCEPTED);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Error enabling "
+                    "reception of broadcast frames on '%s'.", nic->svc_name);
                 goto error;
         }
@@ -313 +318 @@
             (unsigned) iplink_sid);
 
-        list_foreach(ethip_nic_list, link) {
+        list_foreach(ethip_nic_list, link, ethip_nic_t, nic) {
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_find_by_iplink_sid - element");
-                ethip_nic_t *nic = list_get_instance(link, ethip_nic_t, link);
-
                 if (nic->iplink_sid == iplink_sid) {
                         log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_find_by_iplink_sid - found %p", nic);
@@ -350 +353 @@
         size_t count = 0;
         
-        list_foreach(nic->addr_list, link) {
-                ethip_link_addr_t *laddr = list_get_instance(link,
-                    ethip_link_addr_t, link);
-                
+        list_foreach(nic->addr_list, link, ethip_link_addr_t, laddr) {
                 uint16_t af = inet_addr_get(&laddr->addr, NULL, NULL);
                 if (af == AF_INET6)
@@ -371 +371 @@
         size_t i = 0;
         
-        list_foreach(nic->addr_list, link) {
-                assert(i < count);
-                
-                ethip_link_addr_t *laddr = list_get_instance(link,
-                    ethip_link_addr_t, link);
-                
+        list_foreach(nic->addr_list, link, ethip_link_addr_t, laddr) {
                 addr128_t v6;
                 uint16_t af = inet_addr_get(&laddr->addr, NULL, &v6);
                 if (af != AF_INET6)
                         continue;
+                
+                assert(i < count);
                 
                 addr48_t mac;
@@ -444 +441 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_addr_find()");
         
-        list_foreach(nic->addr_list, link) {
-                ethip_link_addr_t *laddr = list_get_instance(link,
-                    ethip_link_addr_t, link);
-                
+        list_foreach(nic->addr_list, link, ethip_link_addr_t, laddr) {
                 if (inet_addr_compare(addr, &laddr->addr))
                         return laddr;