Merge branch 'bmk/kernel/20241119/26/net_getifaddrs_no_running_flag/O…

…TP-19366' into bmk/kernel/20241119/27/net_getifaddrs_no_running_flag/OTP-19366
erlang · Nov 22, 2024 · 9ecfd47 · 9ecfd47
2 parents be58cc6 + 99ba814
commit 9ecfd47
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/erts/emulator/nifs/common/prim_net_nif.c b/erts/emulator/nifs/common/prim_net_nif.c
@@ -3423,9 +3423,9 @@ ERL_NIF_TERM encode_if_admin_status(ErlNifEnv* env,
     ERL_NIF_TERM estatus;
 
     if (status) {
-        estatus = atom_enabled;
+        estatus = esock_atom_enabled;
     } else {
-        estatus = atom_disabled;
+        estatus = esock_atom_disabled;
     }
 
     return estatus;

diff --git a/erts/emulator/nifs/common/prim_socket_nif.c b/erts/emulator/nifs/common/prim_socket_nif.c
@@ -2026,6 +2026,7 @@ static const struct in6_addr in6addr_loopback =
     GLOBAL_ATOM_DECL(delayed_ack_time);                \
     GLOBAL_ATOM_DECL(dgram);                           \
     GLOBAL_ATOM_DECL(dhcprunning);                     \
+    GLOBAL_ATOM_DECL(disabled);                        \
     GLOBAL_ATOM_DECL(disable_fragments);               \
     GLOBAL_ATOM_DECL(dlci);                            \
     GLOBAL_ATOM_DECL(dma);                             \
@@ -2044,6 +2045,7 @@ static const struct in6_addr in6addr_loopback =
     GLOBAL_ATOM_DECL(eether);                          \
     GLOBAL_ATOM_DECL(efile);                           \
     GLOBAL_ATOM_DECL(egp);                             \
+    GLOBAL_ATOM_DECL(enabled);                         \
     GLOBAL_ATOM_DECL(enotsup);                         \
     GLOBAL_ATOM_DECL(eor);                             \
     GLOBAL_ATOM_DECL(error);                           \

diff --git a/erts/emulator/nifs/common/socket_int.h b/erts/emulator/nifs/common/socket_int.h
@@ -282,6 +282,7 @@ typedef long ssize_t;
     GLOBAL_ATOM_DEF(delayed_ack_time);         \
     GLOBAL_ATOM_DEF(dgram);                    \
     GLOBAL_ATOM_DEF(dhcprunning);              \
+    GLOBAL_ATOM_DEF(disabled);                 \
     GLOBAL_ATOM_DEF(disable_fragments);        \
     GLOBAL_ATOM_DEF(dlci);                     \
     GLOBAL_ATOM_DEF(dma);                      \
@@ -300,6 +301,7 @@ typedef long ssize_t;
     GLOBAL_ATOM_DEF(eether);                   \
     GLOBAL_ATOM_DEF(efile);                    \
     GLOBAL_ATOM_DEF(egp);                      \
+    GLOBAL_ATOM_DEF(enabled);                  \
     GLOBAL_ATOM_DEF(enotsup);                  \
     GLOBAL_ATOM_DEF(eor);                      \
     GLOBAL_ATOM_DEF(error);                    \