Changeset 2b3dd78 in mainline for uspace/lib/drv/include/ops/nic.h

Timestamp:

2018-01-31T12:02:00Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5595841

Parents:

a0a9cc2 (diff), 14d789c (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 remote-tracking branch 'upstream/master' into forwardport

change tmon includes because of new stdlib

File:

• uspace/lib/drv/include/ops/nic.h (modified) (1 diff)

uspace/lib/drv/include/ops/nic.h

@@ -66 +66 @@
         errno_t (*autoneg_restart)(ddf_fun_t *);
         errno_t (*get_pause)(ddf_fun_t *, nic_result_t *, nic_result_t *,
-                uint16_t *);
+            uint16_t *);
         errno_t (*set_pause)(ddf_fun_t *, int, int, uint16_t);