diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-31 00:14:15 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-31 00:14:15 +0100 |
| commit | 774e6e554c0c3938e80d57e93c4b6098f4bf4208 (patch) | |
| tree | 6626955bf76c04ed5533e0bc433447b253af4ad7 /debian/patches/git_team_structure.patch | |
| parent | c424b42b33018994dc58daeaded2d6a6e671c2c4 (diff) | |
debian/patches/git_team_structure.patch:
- backport upstream change 'fix team link-watcher struct layout', the tests/build failed on i386
Diffstat (limited to 'debian/patches/git_team_structure.patch')
| -rw-r--r-- | debian/patches/git_team_structure.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/debian/patches/git_team_structure.patch b/debian/patches/git_team_structure.patch new file mode 100644 index 00000000..32495ebf --- /dev/null +++ b/debian/patches/git_team_structure.patch @@ -0,0 +1,36 @@ +From 63b90f0dd175c7b38aecb3b8e9bad3fb8bad2265 Mon Sep 17 00:00:00 2001 +From: Beniamino Galvani <bgalvani@redhat.com> +Date: Sat, 26 Jan 2019 18:37:12 +0100 +Subject: [PATCH] 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 +--- + libnm-core/nm-setting-team.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libnm-core/nm-setting-team.c b/libnm-core/nm-setting-team.c +index 3161c05f4..867db5227 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; + }; + }; +-- +2.18.1 + + |