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

File:

• uspace/srv/net/ethip/ethip_nic.c (modified) (5 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;
@@ -313 +311 @@
             (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 +346 @@
         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 +364 @@
         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 +434 @@
         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;