colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

platform: drop _genl_sock() function and directly access data

Browse Source
This commit is contained in:
Thomas Haller
2022-06-16 23:18:00 +02:00
parent 67d64fd4e5
commit 9c8b957704
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/libnm-platform/nm-linux-platform.c
View File

@@ -570,8 +570,7 @@ static void cache_on_change(NMPlatform *platform,
const NMPObject *obj_old, const NMPObject *obj_old,
const NMPObject *obj_new); const NMPObject *obj_new);
static void cache_prune_all(NMPlatform *platform); static void cache_prune_all(NMPlatform *platform);
static gboolean event_handler_read_netlink(NMPlatform *platform, gboolean wait_for_acks); static gboolean event_handler_read_netlink(NMPlatform *platform, gboolean wait_for_acks);
static struct nl_sock *_genl_sock(NMLinuxPlatform *platform);
/*****************************************************************************/ /*****************************************************************************/
@@ -3222,13 +3221,13 @@ _new_from_nl_link(NMPlatform *platform,
case NM_LINK_TYPE_OLPC_MESH: case NM_LINK_TYPE_OLPC_MESH:
obj->_link.ext_data = obj->_link.ext_data =
(GObject *) nm_wifi_utils_new(ifi->ifi_index, (GObject *) nm_wifi_utils_new(ifi->ifi_index,
_genl_sock(NM_LINUX_PLATFORM(platform)), NM_LINUX_PLATFORM_GET_PRIVATE(platform)->genl,
TRUE); TRUE);
break; break;
case NM_LINK_TYPE_WPAN: case NM_LINK_TYPE_WPAN:
obj->_link.ext_data = obj->_link.ext_data =
(GObject *) nm_wpan_utils_new(ifi->ifi_index, (GObject *) nm_wpan_utils_new(ifi->ifi_index,
_genl_sock(NM_LINUX_PLATFORM(platform)), NM_LINUX_PLATFORM_GET_PRIVATE(platform)->genl,
TRUE); TRUE);
break; break;
default: default:
@@ -5204,14 +5203,6 @@ nla_put_failure:
/*****************************************************************************/ /*****************************************************************************/
static struct nl_sock *
_genl_sock(NMLinuxPlatform *platform)
{
NMLinuxPlatformPrivate *priv = NM_LINUX_PLATFORM_GET_PRIVATE(platform);
return priv->genl;
}
#define ASSERT_SYSCTL_ARGS(pathid, dirfd, path) \ #define ASSERT_SYSCTL_ARGS(pathid, dirfd, path) \
G_STMT_START \ G_STMT_START \
{ \ { \