diff options
author | Mark Brown <broonie@linaro.org> | 2013-12-18 17:24:24 +0000 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-12-18 17:24:41 +0000 |
commit | d1c8b1bd093cb57860fb6446e096e1c1cda92d4d (patch) | |
tree | 9c93ddf1ced6064a7f75a3f8a3691d09e624edb9 /drivers/net/team/team.c | |
parent | d13733f4a24d93c582f22f17b5434cf195b7d505 (diff) | |
parent | 1b1ccee1e821e59c2a45c95b007aeb2c9dafd9be (diff) | |
download | blackbird-op-linux-d1c8b1bd093cb57860fb6446e096e1c1cda92d4d.tar.gz blackbird-op-linux-d1c8b1bd093cb57860fb6446e096e1c1cda92d4d.zip |
Merge tag 's2mps11-build' into regulator-s5m8767 since a following patch
depend on it.
regulator/clk: Fix s2mps11 build
This patch fixes a build failure that appeared in v3.13-rc4 due to an
RTC/MFD update merged via -mm.
Diffstat (limited to 'drivers/net/team/team.c')
-rw-r--r-- | drivers/net/team/team.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index 34b0de09d881..736050d6b451 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -1366,6 +1366,8 @@ static int team_user_linkup_option_get(struct team *team, return 0; } +static void __team_carrier_check(struct team *team); + static int team_user_linkup_option_set(struct team *team, struct team_gsetter_ctx *ctx) { @@ -1373,6 +1375,7 @@ static int team_user_linkup_option_set(struct team *team, port->user.linkup = ctx->data.bool_val; team_refresh_port_linkup(port); + __team_carrier_check(port->team); return 0; } @@ -1392,6 +1395,7 @@ static int team_user_linkup_en_option_set(struct team *team, port->user.linkup_enabled = ctx->data.bool_val; team_refresh_port_linkup(port); + __team_carrier_check(port->team); return 0; } |