Changeset 98abd40 in mainline for uspace/srv/net/ethip/ethip_nic.c

Timestamp:

2013-07-06T21:57:22Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c8bb1633, cdc8a391

Parents:

b8e72fd1 (diff), 507c6f3 (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

File:

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

uspace/srv/net/ethip/ethip_nic.c

@@ -121 +121 @@
 }
 
-static ethip_link_addr_t *ethip_nic_addr_new(iplink_srv_addr_t *addr)
+static ethip_link_addr_t *ethip_nic_addr_new(inet_addr_t *addr)
 {
         ethip_link_addr_t *laddr = calloc(1, sizeof(ethip_link_addr_t));
-
         if (laddr == NULL) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed allocating NIC address structure. "
@@ -130 +129 @@
                 return NULL;
         }
-
+        
         link_initialize(&laddr->addr_list);
-        laddr->addr.ipv4 = addr->ipv4;
+        laddr->addr = *addr;
+        
         return laddr;
 }
@@ -193 +193 @@
                 goto error;
         }
-
-        mac48_decode(nic_address.address, &nic->mac_addr);
+        
+        addr48(nic_address.address, nic->mac_addr);
 
         rc = nic_set_state(nic->sess, NIC_STATE_ACTIVE);
@@ -203 +203 @@
         }
 
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "Initialized IP link service, MAC = 0x%" PRIx64,
-            nic->mac_addr.addr);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "Initialized IP link service,");
 
         return EOK;
@@ -335 +334 @@
 }
 
-int ethip_nic_addr_add(ethip_nic_t *nic, iplink_srv_addr_t *addr)
-{
-        ethip_link_addr_t *laddr;
-
+int ethip_nic_addr_add(ethip_nic_t *nic, inet_addr_t *addr)
+{
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_addr_add()");
-        laddr = ethip_nic_addr_new(addr);
+        
+        ethip_link_addr_t *laddr = ethip_nic_addr_new(addr);
         if (laddr == NULL)
                 return ENOMEM;
-
+        
         list_append(&laddr->addr_list, &nic->addr_list);
         return EOK;
 }
 
-int ethip_nic_addr_remove(ethip_nic_t *nic, iplink_srv_addr_t *addr)
-{
-        ethip_link_addr_t *laddr;
-
+int ethip_nic_addr_remove(ethip_nic_t *nic, inet_addr_t *addr)
+{
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_addr_remove()");
-
-        laddr = ethip_nic_addr_find(nic, addr);
+        
+        ethip_link_addr_t *laddr = ethip_nic_addr_find(nic, addr);
         if (laddr == NULL)
                 return ENOENT;
-
+        
         list_remove(&laddr->addr_list);
         ethip_link_addr_delete(laddr);
@@ -364 +360 @@
 
 ethip_link_addr_t *ethip_nic_addr_find(ethip_nic_t *nic,
-    iplink_srv_addr_t *addr)
+    inet_addr_t *addr)
 {
         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, addr_list);
-
-                if (addr->ipv4 == laddr->addr.ipv4)
+                
+                if (inet_addr_compare(addr, &laddr->addr))
                         return laddr;
         }
-
+        
         return NULL;
 }