Changeset 47f5a77 in mainline for uspace/srv/net/inetsrv/inetsrv.h

Timestamp:

2013-07-17T08:46:06Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

3a0a4d8

Parents:

cdc3afa (diff), 1d94e21 (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/inetsrv.h (modified) (2 diffs)

uspace/srv/net/inetsrv/inetsrv.h

@@ -113 +113 @@
         uint8_t ttl;
         /** Identifier */
-        uint16_t ident;
+        uint32_t ident;
         /** Do not fragment */
         bool df;
@@ -141 +141 @@
         iplink_t *iplink;
         size_t def_mtu;
+        addr48_t mac;
+        bool mac_valid;
 } inet_link_t;