Changeset aa85487 in mainline for uspace/srv/net/nil/eth/eth.c

Timestamp:

2010-03-07T15:11:56Z (15 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

aadf01e

Parents:

2e99277 (diff), 137691a (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, revision 308

File:

• uspace/srv/net/nil/eth/eth.c (modified) (1 diff)

uspace/srv/net/nil/eth/eth.c

@@ -308 +308 @@
         eth_device_ref  device;
         int                             index;
-        measured_string_t       names[ 2 ] = {{ "ETH_MODE", 8 }, { "ETH_DUMMY", 9 }};
+        measured_string_t       names[ 2 ] = {{ str_dup("ETH_MODE"), 8 }, { str_dup("ETH_DUMMY"), 9 }};
         measured_string_ref     configuration;
         size_t                          count = sizeof( names ) / sizeof( measured_string_t );