From 6dc021926f65520069a17409ad981c70d9641465 Mon Sep 17 00:00:00 2001 From: Jiri Pirko Date: Fri, 1 Feb 2013 08:17:26 +0000 Subject: [PATCH] --- yaml --- r: 352071 b: refs/heads/master c: 675b8044e17cc6528363e8b0322be0243621cd9b h: refs/heads/master i: 352069: 8816f15dd3af2ff1194caf065b530c106bc33b1f 352067: 7f261c51dbc16e92c06d0f34b2689d3ec9f3641a 352063: b5052edcf338ab62417204c054aad3f699cc71e1 v: v3 --- [refs] | 2 +- trunk/drivers/net/team/team_mode_activebackup.c | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c4d9cef412c7..33431e9a47e5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c3969d80a396bffd7f80ff57987b15793be67926 +refs/heads/master: 675b8044e17cc6528363e8b0322be0243621cd9b diff --git a/trunk/drivers/net/team/team_mode_activebackup.c b/trunk/drivers/net/team/team_mode_activebackup.c index 6262b4defd93..40fd3381b693 100644 --- a/trunk/drivers/net/team/team_mode_activebackup.c +++ b/trunk/drivers/net/team/team_mode_activebackup.c @@ -19,6 +19,7 @@ struct ab_priv { struct team_port __rcu *active_port; + struct team_option_inst_info *ap_opt_inst_info; }; static struct ab_priv *ab_priv(struct team *team) @@ -54,8 +55,17 @@ static bool ab_transmit(struct team *team, struct sk_buff *skb) static void ab_port_leave(struct team *team, struct team_port *port) { - if (ab_priv(team)->active_port == port) + if (ab_priv(team)->active_port == port) { RCU_INIT_POINTER(ab_priv(team)->active_port, NULL); + team_option_inst_set_change(ab_priv(team)->ap_opt_inst_info); + } +} + +static int ab_active_port_init(struct team *team, + struct team_option_inst_info *info) +{ + ab_priv(team)->ap_opt_inst_info = info; + return 0; } static int ab_active_port_get(struct team *team, struct team_gsetter_ctx *ctx) @@ -88,6 +98,7 @@ static const struct team_option ab_options[] = { { .name = "activeport", .type = TEAM_OPTION_TYPE_U32, + .init = ab_active_port_init, .getter = ab_active_port_get, .setter = ab_active_port_set, },