Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 314507
b: refs/heads/master
c: 4bccfd1
h: refs/heads/master
i:
  314505: 4b2864f
  314503: fbdec19
v: v3
  • Loading branch information
Jiri Pirko authored and David S. Miller committed Jun 19, 2012
1 parent ddc16d2 commit 72edea3
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f88725ffb069fef0ea3d47381d33c928f4c48cba
refs/heads/master: 4bccfd17e1f77593e99d5321c48c704a0a43ab68
4 changes: 4 additions & 0 deletions trunk/drivers/net/team/team.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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--;
Expand Down
2 changes: 2 additions & 0 deletions trunk/include/linux/if_team.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 72edea3

Please sign in to comment.