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

team: trivial: use a variable instead of nm_device_get_ip_iface() calls

Browse Source 
This reads a little better and performs marginally better.

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1361
This commit is contained in:
Lubomir Rintel
2022-09-01 10:42:31 +02:00
parent db88bc5090
commit 38251ad59f
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/core/devices/team/nm-device-team.c
View File

@@ -885,8 +885,9 @@ attach_port(NMDevice *device,
static void static void
detach_port(NMDevice *device, NMDevice *port, gboolean configure) detach_port(NMDevice *device, NMDevice *port, gboolean configure)
{ {
NMDeviceTeam *self = NM_DEVICE_TEAM(device); NMDeviceTeam *self = NM_DEVICE_TEAM(device);
NMDeviceTeamPrivate *priv = NM_DEVICE_TEAM_GET_PRIVATE(self); NMDeviceTeamPrivate *priv = NM_DEVICE_TEAM_GET_PRIVATE(self);
const char *port_iface = nm_device_get_ip_iface(port);
gboolean do_release, success; gboolean do_release, success;
NMSettingTeamPort *s_port; NMSettingTeamPort *s_port;
int ifindex_port; int ifindex_port;
@@ -902,36 +903,34 @@ detach_port(NMDevice *device, NMDevice *port, gboolean configure)
ifindex_port = nm_device_get_ip_ifindex(port); ifindex_port = nm_device_get_ip_ifindex(port);
if (ifindex_port <= 0) { if (ifindex_port <= 0) {
_LOGD(LOGD_TEAM, "team port %s is already detached", nm_device_get_ip_iface(port)); _LOGD(LOGD_TEAM, "team port %s is already detached", port_iface);
} else if (do_release) { } else if (do_release) {
success = nm_platform_link_release(nm_device_get_platform(device), success = nm_platform_link_release(nm_device_get_platform(device),
nm_device_get_ip_ifindex(device), nm_device_get_ip_ifindex(device),
ifindex_port); ifindex_port);
if (success) if (success)
_LOGI(LOGD_TEAM, "detached team port %s", nm_device_get_ip_iface(port)); _LOGI(LOGD_TEAM, "detached team port %s", port_iface);
else else
_LOGW(LOGD_TEAM, "failed to detach team port %s", nm_device_get_ip_iface(port)); _LOGW(LOGD_TEAM, "failed to detach team port %s", port_iface);
/* Kernel team code "closes" the port when releasing it, (which clears /* Kernel team code "closes" the port when releasing it, (which clears
* IFF_UP), so we must bring it back up here to ensure carrier changes and * IFF_UP), so we must bring it back up here to ensure carrier changes and
* other state is noticed by the now-released port. * other state is noticed by the now-released port.
*/ */
if (!nm_device_bring_up(port, TRUE, NULL)) { if (!nm_device_bring_up(port, TRUE, NULL)) {
_LOGW(LOGD_TEAM, _LOGW(LOGD_TEAM, "detached team port %s could not be brought up", port_iface);
"detached team port %s could not be brought up",
nm_device_get_ip_iface(port));
} }
nm_clear_g_source(&priv->teamd_read_timeout); nm_clear_g_source(&priv->teamd_read_timeout);
priv->teamd_read_timeout = g_timeout_add_seconds(5, teamd_read_timeout_cb, self); priv->teamd_read_timeout = g_timeout_add_seconds(5, teamd_read_timeout_cb, self);
} else } else
_LOGI(LOGD_TEAM, "team port %s was detached", nm_device_get_ip_iface(port)); _LOGI(LOGD_TEAM, "team port %s was detached", port_iface);
/* Delete any port configuration we previously set */ /* Delete any port configuration we previously set */
if (configure && priv->tdc if (configure && priv->tdc
&& (s_port = nm_device_get_applied_setting(port, NM_TYPE_SETTING_TEAM_PORT)) && (s_port = nm_device_get_applied_setting(port, NM_TYPE_SETTING_TEAM_PORT))
&& (nm_setting_team_port_get_config(s_port))) && (nm_setting_team_port_get_config(s_port)))
teamdctl_port_config_update_raw(priv->tdc, nm_device_get_ip_iface(port), "{}"); teamdctl_port_config_update_raw(priv->tdc, port_iface, "{}");
} }
static gboolean static gboolean