From 72edea310bb5d2da79a58d40341b222e6107cd36 Mon Sep 17 00:00:00 2001 From: Jiri Pirko Date: Tue, 19 Jun 2012 05:54:16 +0000 Subject: [PATCH] --- yaml --- r: 314507 b: refs/heads/master c: 4bccfd17e1f77593e99d5321c48c704a0a43ab68 h: refs/heads/master i: 314505: 4b2864f8190677c43f4905802a1799199465f149 314503: fbdec19290633a6249da4cf0060a9e0205d67717 v: v3 --- [refs] | 2 +- trunk/drivers/net/team/team.c | 4 ++++ trunk/include/linux/if_team.h | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 010b22f4470b..223925ed2389 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f88725ffb069fef0ea3d47381d33c928f4c48cba +refs/heads/master: 4bccfd17e1f77593e99d5321c48c704a0a43ab68 diff --git a/trunk/drivers/net/team/team.c b/trunk/drivers/net/team/team.c index eb18ac93095a..bc76f946e071 100644 --- a/trunk/drivers/net/team/team.c +++ b/trunk/drivers/net/team/team.c @@ -714,6 +714,8 @@ static void team_port_enable(struct team *team, port->index = team->en_port_count++; hlist_add_head_rcu(&port->hlist, team_port_index_hash(team, port->index)); + if (team->ops.port_enabled) + team->ops.port_enabled(team, port); } static void __reconstruct_port_hlist(struct team *team, int rm_index) @@ -737,6 +739,8 @@ static void team_port_disable(struct team *team, if (!team_port_enabled(port)) return; + if (team->ops.port_disabled) + team->ops.port_disabled(team, port); hlist_del_rcu(&port->hlist); __reconstruct_port_hlist(team, rm_index); team->en_port_count--; diff --git a/trunk/include/linux/if_team.h b/trunk/include/linux/if_team.h index 2f2972535cc0..c1938869191f 100644 --- a/trunk/include/linux/if_team.h +++ b/trunk/include/linux/if_team.h @@ -74,6 +74,8 @@ struct team_mode_ops { int (*port_enter)(struct team *team, struct team_port *port); void (*port_leave)(struct team *team, struct team_port *port); void (*port_change_mac)(struct team *team, struct team_port *port); + void (*port_enabled)(struct team *team, struct team_port *port); + void (*port_disabled)(struct team *team, struct team_port *port); }; enum team_option_type {