Changeset 1c6c3e1d in mainline for uspace/srv/net/ethip/ethip.c

Timestamp:

2023-10-22T17:55:33Z (14 months ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

ticket/834-toolchain-update

Children:

350ec74

Parents:

315d487 (diff), 133461c (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 branch 'master' into ticket

File:

• uspace/srv/net/ethip/ethip.c (modified) (4 diffs)

uspace/srv/net/ethip/ethip.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -78 +78 @@
 };
 
+static loc_srv_t *ethip_srv;
+
 static errno_t ethip_init(void)
 {
         async_set_fallback_port_handler(ethip_client_conn, NULL);
 
-        errno_t rc = loc_server_register(NAME);
+        errno_t rc = loc_server_register(NAME, &ethip_srv);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering server.");
@@ -115 +117 @@
         }
 
-        rc = loc_service_register(svc_name, &sid);
+        rc = loc_service_register(ethip_srv, svc_name, &sid);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service %s.", svc_name);
@@ -129 +131 @@
         }
 
-        rc = loc_service_add_to_cat(sid, iplink_cat);
+        rc = loc_service_add_to_cat(ethip_srv, sid, iplink_cat);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed adding %s to category.", svc_name);