aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Pirko <jiri@resnulli.us>2015-03-19 09:12:14 +0100
committerJiri Pirko <jiri@resnulli.us>2015-03-19 09:17:23 +0100
commit01c1e7888cd9a78c53bef3bd8cf476ebe018fa31 (patch)
treed6bd33f6f11d83d28a5a3b208d8e856ac5d3d168
parent75a5fb5025bd263cfb68a62ddd84c344174aff86 (diff)
downloadlibteam-01c1e7888cd9a78c53bef3bd8cf476ebe018fa31.tar.gz
teamd: do not change ctx->hwaddr pointer
ctx->hwaddr is set to team_get_ifinfo_hwaddr(ctx->ifinfo) and it should stay that way. Commit 4f75356a0919 changed ctx->hwaddr to team_get_ifinfo_orig_hwaddr(tdport->team_ifinfo) which is incorrect. After this change, hwaddr won't get updated. Now that we handle hwaddr change in lacp and mirror it to ports, we can fix this by removing ctx->hwaddr set. Fixes: 4f75356a0919 ("teamd: update hwaddr when changing team's macaddr") Signed-off-by: Jiri Pirko <jiri@resnulli.us>
-rw-r--r--teamd/teamd.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/teamd/teamd.c b/teamd/teamd.c
index c99ee87..1e45db8 100644
--- a/teamd/teamd.c
+++ b/teamd/teamd.c
@@ -855,7 +855,7 @@ static int teamd_add_ports(struct teamd_context *ctx)
static int teamd_hwaddr_check_change(struct teamd_context *ctx,
struct teamd_port *tdport)
{
- char *hwaddr;
+ const char *hwaddr;
unsigned char hwaddr_len;
int err;
@@ -873,7 +873,6 @@ static int teamd_hwaddr_check_change(struct teamd_context *ctx,
teamd_log_err("Failed to set team device hardware address.");
return err;
}
- ctx->hwaddr = hwaddr;
return 0;
}