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-28 08:18:09 +0100
commit63b90f0dd175c7b38aecb3b8e9bad3fb8bad2265 (patch)
tree83a212e187f5cb4d085f5bb0e3c17b25fb71782b
parentce3f7bf812c21773251748693cd39d2fb54b9055 (diff)
downloadNetworkManager-63b90f0dd175c7b38aecb3b8e9bad3fb8bad2265.tar.gz
libnm-core: fix team link-watcher struct layout
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;
};
};