Changes in uspace/srv/net/ethip/ethip_nic.c [5a324d99:83781a22] in mainline

File:

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

uspace/srv/net/ethip/ethip_nic.c

@@ -45 +45 @@
 #include <device/nic.h>
 #include <stdlib.h>
+#include <net/socket_codes.h>
 #include <mem.h>
 #include "ethip.h"
@@ -83 +84 @@
                 already_known = false;
 
-                list_foreach(ethip_nic_list, link, ethip_nic_t, nic) {
+                list_foreach(ethip_nic_list, link) {
+                        ethip_nic_t *nic = list_get_instance(link,
+                            ethip_nic_t, link);
                         if (nic->svc_id == svcs[i]) {
                                 already_known = true;
@@ -198 +201 @@
                 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;
         }
@@ -317 +313 @@
             (unsigned) iplink_sid);
 
-        list_foreach(ethip_nic_list, link, ethip_nic_t, nic) {
+        list_foreach(ethip_nic_list, link) {
                 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);
@@ -352 +350 @@
         size_t count = 0;
         
-        list_foreach(nic->addr_list, link, ethip_link_addr_t, laddr) {
-                ip_ver_t ver = inet_addr_get(&laddr->addr, NULL, NULL);
-                if (ver == ip_v6)
+        list_foreach(nic->addr_list, link) {
+                ethip_link_addr_t *laddr = list_get_instance(link,
+                    ethip_link_addr_t, link);
+                
+                uint16_t af = inet_addr_get(&laddr->addr, NULL, NULL);
+                if (af == AF_INET6)
                         count++;
         }
@@ -370 +371 @@
         size_t i = 0;
         
-        list_foreach(nic->addr_list, link, ethip_link_addr_t, laddr) {
+        list_foreach(nic->addr_list, link) {
+                assert(i < count);
+                
+                ethip_link_addr_t *laddr = list_get_instance(link,
+                    ethip_link_addr_t, link);
+                
                 addr128_t v6;
-                ip_ver_t ver = inet_addr_get(&laddr->addr, NULL, &v6);
-                if (ver != ip_v6)
+                uint16_t af = inet_addr_get(&laddr->addr, NULL, &v6);
+                if (af != AF_INET6)
                         continue;
-                
-                assert(i < count);
                 
                 addr48_t mac;
@@ -440 +444 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_addr_find()");
         
-        list_foreach(nic->addr_list, link, ethip_link_addr_t, laddr) {
+        list_foreach(nic->addr_list, link) {
+                ethip_link_addr_t *laddr = list_get_instance(link,
+                    ethip_link_addr_t, link);
+                
                 if (inet_addr_compare(addr, &laddr->addr))
                         return laddr;