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

Timestamp:

2013-04-19T18:38:18Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6d717a4

Parents:

a1e2df13 (diff), 289cb7dd (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 chages.

File:

• uspace/srv/net/inetsrv/inet_link.c (modified) (2 diffs)

uspace/srv/net/inetsrv/inet_link.c

@@ -35 +35 @@
  */
 
-#include <bool.h>
+#include <stdbool.h>
 #include <errno.h>
 #include <fibril_synch.h>
@@ -202 +202 @@
                 first = 0;
         } else {
-                addr->naddr.ipv4 = (10 << 24) + (0 << 16) + (0 << 8) + 2;
+                addr->naddr.ipv4 = (192 << 24) + (168 << 16) + (0 << 8) + 4;
         }
         addr->naddr.bits = 24;