Changeset b5ba8f6 in mainline for uspace/srv/net/inetsrv/inet_link.c

Timestamp:

2013-09-13T13:11:53Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

1eaa3cf

Parents:

95027b5 (diff), 1c5f6f8 (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/inetsrv/inet_link.c (modified) (2 diffs)

uspace/srv/net/inetsrv/inet_link.c

@@ -235 +235 @@
         inet_addrobj_t *addr = NULL;
         
+        /* XXX FIXME Cannot rely on loopback being the first IP link service!! */
         if (first_link) {
                 addr = inet_addrobj_new();
@@ -240 +241 @@
                 inet_naddr(&addr->naddr, 127, 0, 0, 1, 24);
                 first_link = false;
-        } else {
-                /*
-                 * FIXME
-                 * Setting static IPv4 address for testing purposes:
-                 * 10.0.2.15/24
-                 */
-                addr = inet_addrobj_new();
-                
-                inet_naddr(&addr->naddr, 10, 0, 2, 15, 24);
         }