Changeset a676574 in mainline for uspace/srv/net/netif/lo/lo.c

Timestamp:

2011-01-09T12:18:00Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

54de5ebd

Parents:

a3eeef45 (diff), 9d12059 (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/netif/lo/lo.c (modified) (3 diffs)

uspace/srv/net/netif/lo/lo.c

@@ -53 +53 @@
 
 /** Default hardware address. */
-#define DEFAULT_ADDR            "\0\0\0\0\0\0"
+#define DEFAULT_ADDR  0
 
 /** Default address length. */
-#define DEFAULT_ADDR_LEN        (sizeof(DEFAULT_ADDR) / sizeof(char))
+#define DEFAULT_ADDR_LEN  6
 
 /** Loopback module name. */
@@ -62 +62 @@
 
 /** Network interface global data. */
-netif_globals_t netif_globals;
+netif_globals_t netif_globals;
 
 int netif_specific_message(ipc_callid_t callid, ipc_call_t *call,
@@ -74 +74 @@
         if (!address)
                 return EBADMEM;
-
-        address->value = str_dup(DEFAULT_ADDR);
+        
+        uint8_t *addr = (uint8_t *) malloc(DEFAULT_ADDR_LEN);
+        memset(addr, DEFAULT_ADDR, DEFAULT_ADDR_LEN);
+        
+        address->value = addr;
         address->length = DEFAULT_ADDR_LEN;
-
+        
         return EOK;
 }