summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeniamino Galvani <bgalvani@redhat.com>2019-01-26 18:37:12 +0100
committerBeniamino Galvani <bgalvani@redhat.com>2019-01-26 18:40:57 +0100
commit779303ca4fbde20842fb7cee0cab31c3145690b6 (patch)
tree48fa0884788729ade16cc6295dee7a66e37a0da5
parent76c1b94fe0f0d135d1df898b1d600e46a654d590 (diff)
downloadNetworkManager-bg/issue110.tar.gz
libnm-core: fix team link-watcher struct layoutbg/issue110
As the comment above the union says, structs in the union must have the same layout of arp_ping. 'vlanid' is in the wrong place and breaks that. Fixes: f44c793f6cd89c3e84e83872478daf286821ed64 https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/110
-rw-r--r--libnm-core/nm-setting-team.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libnm-core/nm-setting-team.c b/libnm-core/nm-setting-team.c
index 3161c05f43..867db52276 100644
--- a/libnm-core/nm-setting-team.c
+++ b/libnm-core/nm-setting-team.c
@@ -84,10 +84,10 @@ struct NMTeamLinkWatcher {
int init_wait;
int interval;
int missed_max;
- int vlanid;
char *target_host;
char *source_host;
NMTeamLinkWatcherArpPingFlags flags;
+ int vlanid;
} arp_ping;
};
};