Changeset 95c675b in mainline for uspace/app/nic/nic.c

Timestamp:

2017-10-17T13:11:35Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (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

File:

• uspace/app/nic/nic.c (modified) (3 diffs)

uspace/app/nic/nic.c

@@ -120 +120 @@
         if (sess == NULL) {
                 printf("Error connecting to service.\n");
+                rc = EIO;
                 goto error;
         }
@@ -209 +210 @@
 }
 
-static const char *nic_multicast_mode_str(nic_unicast_mode_t mode)
+static const char *nic_multicast_mode_str(nic_multicast_mode_t mode)
 {
         switch (mode) {
@@ -220 +221 @@
 }
 
-static const char *nic_broadcast_mode_str(nic_unicast_mode_t mode)
+static const char *nic_broadcast_mode_str(nic_broadcast_mode_t mode)
 {
         switch (mode) {