Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[teamd]: Update hwaddr_orig unconditionally. #2254

Merged
merged 1 commit into from
Nov 14, 2018
Merged

[teamd]: Update hwaddr_orig unconditionally. #2254

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions src/libteam/0005-libteam-Add-warm_reboot-mode.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
diff --git a/libteam/ifinfo.c b/libteam/ifinfo.c
index 72155ae..44de4ca 100644
--- a/libteam/ifinfo.c
+++ b/libteam/ifinfo.c
@@ -105,15 +105,13 @@ static void update_hwaddr(struct team_ifinfo *ifinfo, struct rtnl_link *link)
hwaddr_len = nl_addr_get_len(nl_addr);
if (ifinfo->hwaddr_len != hwaddr_len) {
ifinfo->hwaddr_len = hwaddr_len;
- if (!ifinfo->master_ifindex)
- ifinfo->orig_hwaddr_len = hwaddr_len;
+ ifinfo->orig_hwaddr_len = hwaddr_len;
set_changed(ifinfo, CHANGED_HWADDR_LEN);
}
hwaddr = nl_addr_get_binary_addr(nl_addr);
if (memcmp(ifinfo->hwaddr, hwaddr, hwaddr_len)) {
memcpy(ifinfo->hwaddr, hwaddr, hwaddr_len);
- if (!ifinfo->master_ifindex)
- memcpy(ifinfo->orig_hwaddr, hwaddr, hwaddr_len);
+ memcpy(ifinfo->orig_hwaddr, hwaddr, hwaddr_len);
set_changed(ifinfo, CHANGED_HWADDR);
}
}
diff --git a/teamd/teamd.c b/teamd/teamd.c
index c987333..53aec1d 100644
--- a/teamd/teamd.c
Expand Down